Index: /applications/editors/josm/i18n/po/ar.po =================================================================== --- /applications/editors/josm/i18n/po/ar.po (revision 22208) +++ /applications/editors/josm/i18n/po/ar.po (revision 22209) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-23 22:19+0000\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-28 15:33+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Arabic \n" @@ -17,5 +17,5 @@ "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: 2010-06-28 14:54+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:11+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -28,5 +28,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -70,5 +70,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -78,5 +78,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -238,5 +238,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -244,6 +244,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -329,8 +329,7 @@ msgstr "لا يوجد طبقات هدف" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "أضف عقدة..." @@ -648,5 +647,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1027,5 +1026,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1034,5 +1033,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1169,4 +1168,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "" @@ -1440,6 +1440,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1656,6 +1656,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2272,5 +2270,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2502,10 +2500,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "بحث..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "بحث عن أغراض." @@ -2513,65 +2511,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "الرجاء إدخال مصطلحات البحث." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "إستبدل الخيار" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "أضف إلى اخيار" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "أحذف من الخيار" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "عبارة منتظمة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2579,38 +2577,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "الأهداف المميزة:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" msgstr "النوع: - نوع الغرض (عقدة, طريق, علاقة)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "المستخدم:... - كلّ الأغراض اللتي قام المستخدم بتغييرها" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2618,5 +2616,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2624,5 +2622,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2630,5 +2628,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2636,9 +2634,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2646,39 +2644,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "مغيير - كلّ الأغراض المغييرة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "المختارة - كلّ الأغراض المختارة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "غير المكتملة - كلّ الأغراض غير المكتملة" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "غير المسمات - كلّ الأغراض غير المسمات" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "إستعمل | أو أو للدمج بالأو المنطقي" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2686,12 +2684,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2700,38 +2698,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "إبحث" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "إبدء البحث" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "عبارة منتظمة" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "لم أجد شيء مطابق لِــ ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2739,5 +2750,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2745,5 +2756,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2751,5 +2762,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2757,5 +2768,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2876,8 +2887,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3016,5 +3027,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3138,11 +3149,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3151,5 +3162,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3158,5 +3169,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3194,5 +3205,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3501,6 +3512,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3510,10 +3521,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3521,5 +3532,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3528,5 +3539,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3534,78 +3545,4 @@ #, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -3749,5 +3686,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "الخلفية" @@ -3917,5 +3854,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "خط سكة حديد" @@ -3936,7 +3873,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4007,7 +3944,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "" @@ -4096,5 +4033,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4311,5 +4248,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4608,12 +4545,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4624,6 +4561,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4631,6 +4568,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4638,9 +4575,9 @@ msgstr "الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4649,5 +4586,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4656,26 +4593,26 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4683,25 +4620,25 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "" @@ -4747,5 +4684,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "" @@ -4756,5 +4693,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4768,5 +4705,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "" @@ -4835,5 +4772,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4845,5 +4782,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "" @@ -4942,60 +4879,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5003,123 +4889,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "تم حذفه" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" msgstr "" @@ -5267,5 +5088,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "الكلّ" @@ -5345,7 +5166,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5359,6 +5180,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5544,5 +5365,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5598,25 +5419,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5628,22 +5449,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5656,43 +5477,121 @@ msgstr "أضِف" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 +msgid "Enable filter" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 +msgid "Hide elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 -msgid "Enable filter" +msgid "Inverse filter" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 -msgid "Hide elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 -msgid "Inverse filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 msgid "Filter mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +msgid "Error in filter" +msgstr "" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5735,37 +5634,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "أدخل الأحداثيات للعقدة الجديدة." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "إستعمل الدرجات العشرية." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "القيم السلبية هي لنصف الكرة الغربية/الجنوبية" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "الرجاء إدخال خط طول صالح من ضمن المجال -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "الرجاء إدخال خط طول من ضمن المجال -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "الرجاء إدخال خط عرض صالح من ضمن المجال -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "الرجاء إدخال خط عرض من ضمن المجال -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "أغلق الحوار و أنشئ عقدة جديدة" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "أغلق الحوار، لا تأنشئ عقدة جديدة" @@ -5825,5 +5724,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "العلاقات" @@ -5871,10 +5770,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -5938,14 +5837,14 @@ msgstr "الخيار: علاقات:{0} / طرقات:{1} / عقد:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "الخيار: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6646,8 +6545,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6672,6 +6579,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7054,69 +6959,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "الإسم" @@ -7694,5 +7600,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8329,8 +8235,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "النوع" @@ -8359,6 +8265,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "مجهول" @@ -8679,5 +8585,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "" @@ -9195,4 +9101,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9692,5 +9599,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "" @@ -9741,5 +9648,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -9812,23 +9719,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "طبقة المعطيات {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "خارج عن المنطقة المنزلة" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9837,34 +9744,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -9873,32 +9757,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} يتألف من:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -12822,4 +12706,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14269,5 +14154,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14533,5 +14418,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "إستيفاء العنوان" @@ -14965,36 +14850,36 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "متعدد الضلوع" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "العنوان" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "أنشئ علاقة جديدة" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "مباني" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "الرقم" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +msgid "Next no" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "عناوين" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15148,10 +15033,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15206,7 +15095,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15215,13 +15104,13 @@ msgstr "الماء" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15269,32 +15158,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "العنوان" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "تمكين الإخباء التلقائي" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "حجم الخابية الأقصى (م. بايت)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15306,18 +15195,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15325,5 +15214,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15331,130 +15220,134 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15755,5 +15648,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -15762,14 +15655,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "خطء في صيغة المعطيات" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "" @@ -17027,4 +16920,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17065,9 +16977,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -18567,5 +18474,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "" @@ -18752,5 +18659,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "متعدد الضلوع" @@ -19267,5 +19174,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "" @@ -19308,34 +19215,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "الملاحظات" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19358,7 +19268,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "ادخل تعليقك" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20269,7 +20178,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "إفتح ملف." +msgstr "" #. Strings in JFileChooser @@ -20551,7 +20459,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20560,10 +20475,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20572,5 +20487,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20579,15 +20494,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20597,10 +20512,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20609,5 +20524,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20616,5 +20531,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20623,10 +20538,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20635,5 +20550,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20643,5 +20558,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20650,15 +20565,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20667,5 +20582,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -20798,5 +20713,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "" @@ -21335,5 +21250,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "" @@ -21346,5 +21261,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "غابة/حرش" @@ -21649,8 +21564,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "" @@ -21761,8 +21676,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "" @@ -22068,5 +21983,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "" @@ -22186,5 +22101,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "" @@ -22333,4 +22248,9 @@ msgid "Edit Motorway Junction" msgstr "حرّر تقاطع طرقات سريعة" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "الرقم" #. item "Waypoints/Motorway Junction" text "Number" @@ -22383,13 +22303,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "شركة الإدارة" @@ -22657,6 +22577,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "إرتفاع" @@ -23508,5 +23428,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "التوتر" @@ -23877,24 +23797,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "أزقات الإفتتاح" @@ -23961,23 +23881,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "" @@ -23991,23 +23911,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "" @@ -24021,23 +23941,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -24151,6 +24071,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "الرقم المرجعي" @@ -24166,5 +24086,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "تحت الأرض" @@ -24178,5 +24098,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "رسم دخول/إجرة" @@ -24352,5 +24272,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "مناسب لكرسي المقعدين" @@ -24388,5 +24308,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "ملجأ" @@ -24394,5 +24314,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "" @@ -24511,5 +24431,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "عمود إضائة" @@ -25248,5 +25168,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "" @@ -25321,5 +25241,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25433,12 +25401,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25505,12 +25465,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25524,12 +25476,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -25691,5 +25635,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "الرياضة" @@ -25716,4 +25661,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "كرة القدم الأوسترالية" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "كرة القدم الأوسترالية" @@ -25741,4 +25692,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "كرة القدم الأوسترالية" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "" @@ -25781,6 +25738,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "" +#, fuzzy +msgid "gaelic_football" +msgstr "كرة القدم الأوسترالية" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -25821,5 +25779,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +msgid "rugby_union" msgstr "" @@ -25940,6 +25903,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -25953,5 +25920,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -25973,4 +25939,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "النوع" @@ -25994,6 +25962,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26006,5 +25978,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26026,4 +25997,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "" @@ -26046,4 +26019,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "مركز/نادي رياضي" @@ -26066,4 +26041,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "مدرج ألعاب رياضية" @@ -26086,4 +26063,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -26285,158 +26264,193 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "كرة القدم" - -#. item "Sport (Ball)/Football" +msgid "Australian Football" +msgstr "" + +#. item "Sport (Ball)/Australian Football" #: build/trans_presets.java:2071 -msgid "Edit Football" +msgid "Edit Australian Football" +msgstr "" + +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" msgstr "حرّر كرة القدم" -#: build/trans_presets.java:2076 -msgid "Australian Football" -msgstr "" - -#. item "Sport (Ball)/Australian Football" +#. item "Sport (Ball)/American Football" #: build/trans_presets.java:2077 -msgid "Edit Australian Football" -msgstr "" +#, fuzzy +msgid "Edit American Football" +msgstr "حرّر كرة القدم" #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "حرّر كرة القدم" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "حرّر كرة القدم" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "حرّر كرة القدم" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "حرّر كرة القدم" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "حرّر كسّارة / مقلع حجارة" + +#: build/trans_presets.java:2100 +msgid "Rugby Union" +msgstr "" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "حرّر قطر/منطقة" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "كرة السلّة" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "حرّر كرة السلّة" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "تنس الطاولة" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "حرّر تنس الطاولة" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "تنس" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "حرّر تنس" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "مبنى" @@ -26444,5 +26458,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "مبنى عام" @@ -26450,10 +26464,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "حرّر مبنى عام" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "مبنى البلدية" @@ -26461,10 +26475,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "حرّر مبنى البلدية" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "سفارة" @@ -26472,10 +26486,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "حرّر سفارة" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "محكمة" @@ -26484,10 +26498,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "حرّر محكمة" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "سجن" @@ -26496,10 +26510,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "حرّر سجن" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "شرطة" @@ -26509,10 +26523,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "حرّر شرطة" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "فوج إطفاء" @@ -26521,10 +26535,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "حرّر فوج إطفاء" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "مكتب البريد" @@ -26532,5 +26546,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "حرّر مكتب البريد" @@ -26538,15 +26552,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "حضانة أطفال" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "حرّر حضانة أطفال" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "مدرسة" @@ -26554,10 +26568,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "حرّر مدرسة" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "جامعة" @@ -26565,10 +26579,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "حرّر جامعة" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "كلّية" @@ -26576,5 +26590,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "حرّر كلّية" @@ -26582,5 +26596,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "سينما" @@ -26589,10 +26603,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "حرّر سينما" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "مكتبة" @@ -26601,9 +26615,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "حرّر مكتبة" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "مركز ثقافي" @@ -26611,10 +26625,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "حرّر مركز ثقافي" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "مسرح" @@ -26623,10 +26637,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "حرّر مسرح" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "معبد" @@ -26636,5 +26650,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "حرّر معبد" @@ -26643,6 +26657,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "الديانة" @@ -26651,66 +26665,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "بهائي" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "بوذي" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "نصراني" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "هندوس" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "يهودي" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "مسلم" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "سيخ" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "روحاني" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "الطقوس الدينية" @@ -26719,81 +26733,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "معمداني" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "كثليك" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "إنجيلي" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "شهود يهوه" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "لوثري" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "منهجي" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "أرثدكس" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "بروتستاني" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "شيعي" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "سنّي" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "عناوين" @@ -26802,5 +26816,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "حرّر معلومات عنوان" @@ -26808,5 +26822,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "رقم المنزل" @@ -26814,25 +26828,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "تسمية المنزل" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "إسم الشارع" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "إسم المدينة" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "الرمز البريدي" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "رمز البلد" @@ -26841,5 +26855,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "حرّر إستيفاء العنوان" @@ -26847,61 +26861,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "مخطط الترقيم" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "مفرد" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "مثنى" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "من صنع الإنسان" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "المصانع" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "حرّر المصانع" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "برج" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "حرّر برج" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "" @@ -26909,25 +26923,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "خزان / برج مياه" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "حرّر خزان/برج مياه" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "خزان محروقات" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "حرّر خزان المحروقات" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "منارة" @@ -26935,10 +26949,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "حرّر منارة" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "طاحونة هوائية" @@ -26946,10 +26960,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "حرّر طاحونة هوائية" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "خط أنابيب" @@ -26958,41 +26972,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "حرّر خط أنابيب" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "غاز" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "محطّة تكرير مياه" @@ -27002,10 +27016,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "حرّر محطّة تكرير مياه" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "ونش" @@ -27013,5 +27027,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "حرّر ونش" @@ -27019,10 +27033,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "حرّر عمود إضاءة" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "نقطة رؤية" @@ -27030,10 +27044,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "حرّر نقطة رؤية" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "مراقبة" @@ -27041,23 +27055,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "حرّر كامرة مراقبة" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "مولد طاقة" @@ -27067,35 +27081,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "حرّر مولد طاقة" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "أرياح" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "مائية" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "طاقة أحفورية" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "نووية" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "فحم" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "كهرباء شمسية" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "محطة توليد طاقة" @@ -27104,10 +27118,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "حرّر محطة توليد طاقة" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "محطة طاقة فرعية" @@ -27116,5 +27130,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "حرّر محطة طاقة فرعية" @@ -27122,10 +27136,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "رقم الخط" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "عمود كهربائي" @@ -27136,23 +27150,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "حرّر عمود كهربائي" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "سلك/خط كهربائي" @@ -27161,74 +27175,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "حرّر عمود كهربائي" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "خدمات/نافعات" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "مراحيض" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "الملاحظة" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "صندوق بريد" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "هاتف" @@ -27237,5 +27251,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "حرّر هاتف" @@ -27243,5 +27257,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "عملات معدنية" @@ -27249,5 +27263,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "الملاحظات" @@ -27255,5 +27269,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "" @@ -27261,5 +27275,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "" @@ -27267,15 +27281,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "بطاقات إعتماد" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "بطاقات هاتفية" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "إعادة تصنيع الأشياء" @@ -27284,5 +27298,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "حرّر إعادة تصنيع الأشياء" @@ -27290,35 +27304,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "بطاريات" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "علب (معدنية)" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "ملابس" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "زجاج" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "ورق" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "" @@ -27326,5 +27340,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "" @@ -27333,31 +27347,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "" @@ -27436,5 +27450,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27444,31 +27458,31 @@ msgstr "خضار" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "" @@ -27477,30 +27491,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "الإرتفاع" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "منخفض" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "نصف" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "ملء" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "مخبئ" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "نافورة" @@ -27509,10 +27523,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "حرّر نافورة" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "ماء شفة" @@ -27521,10 +27535,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "حرّر ماء شفة" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "" @@ -27533,5 +27547,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "" @@ -27539,5 +27553,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "" @@ -27545,15 +27559,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "مَتاجر/دكاكين" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "" @@ -27561,10 +27575,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "حرّر متجر سيارات" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "" @@ -27573,28 +27587,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "حرر مبيع قطع دراجات" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "سوبرماركت" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "حرّر سوبرماركت" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "" @@ -27602,9 +27616,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "كشك" @@ -27612,27 +27626,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "حرّر كشك" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "جزار" @@ -27640,9 +27654,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "حرّر جزار" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "خباز" @@ -27650,9 +27664,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "حرّر خباز" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "بائع الزهور" @@ -27660,18 +27674,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "حرّر بائع الزهور" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "مأكولات عضوية" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "حرّر مبيع مأكولات عضوية" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "" @@ -27679,54 +27693,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "مشروبات" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "حاسوب" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "حرّر مبيع قطع حاسوب" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "إلكترونيات" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "حرّر إلكترونيات" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "حرّر مبيع Hifi" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "أثاث/فرش" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "حرّر مبيع فرش/أثاث" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "" @@ -27734,9 +27748,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "خردوات/أدوات منزلية" @@ -27744,9 +27758,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "حرّر مخزن خردوات/أدوات منزلية" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "" @@ -27754,54 +27768,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "قرطاسية" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "حرّر مبيع قرطاسية" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "حلاق" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "حرّر حلاق" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "أحذية" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "حرّر أحذية" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "ألعاب" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "حرّر مبيع ألعاب" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "مرئيّات" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "حرّر مبيع مرئيّات" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "تنظيف جاف" @@ -27809,9 +27823,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "حرّر تنظيف جاف" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "مصبغة/غسيل" @@ -27819,9 +27833,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "حرّر مصبغة/غسيل" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "نشاطات في الخلاء" @@ -27829,24 +27843,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "حرّر متجر نشاطات في الخلاء" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "حرّرمبيع لوازم للأنشطة رياضية" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "حرّر نظاراتي" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "آلة بيع" @@ -27854,5 +27868,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "" @@ -27860,97 +27874,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "نوعية المبيعات" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "تذاكر_النقل_العام" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "خرائط_النقل_العام" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "تذاكر_موقف_سيارات" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "مأكولات" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "مشروبات" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "حلويات" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "سجائر" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "صور" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "مأكولات للحيوانات" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "جرائد" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "ألعاب" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "طوابع" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "رقائق SIM" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "قسائم تعبئة هاتفية" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "قسائم" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "مانع الحمل" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "سدادات قطنية" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "نقود/أموال" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "مصرف" @@ -27958,14 +27972,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "حرّر مصرف" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "صرّاف آلي" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "صرّاف" @@ -27973,5 +27987,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "حرّر صرّاف" @@ -27979,15 +27993,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "حرّر صراف آلي" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "صحة" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "أطباء" @@ -27995,18 +28009,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "حرّر أطباء" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "طبيب أسنان" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "حرّر طبيب أسنان" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "صيدلية" @@ -28014,5 +28028,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "حرّر صيدلية" @@ -28020,9 +28034,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "مستشفى" @@ -28030,10 +28044,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "حرّر مستشفى" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "نقطة دخول طوارئ" @@ -28042,5 +28056,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "حرّر نقطة دخول طوارئ" @@ -28049,20 +28063,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "رقم النقطة" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "إسم النقطة" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "رقم الهاتف" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "إستعمل رمز دولي مثل 12-345-67890" @@ -28070,5 +28084,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "بيطري" @@ -28077,64 +28091,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "حرّر بيطري" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "الأماكن" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "قارة" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "حرّر قارة" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "وطن" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "حرّر وطن" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "دولة/ولاية" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "حرّر دولة/ولاية" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "قطر/منطقة" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "حرّر قطر/منطقة" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "" @@ -28142,15 +28156,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "مدينة" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "حرّر مدينة" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "بلدة" @@ -28158,10 +28172,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "حرّر بلدة" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "ضاحية" @@ -28169,25 +28183,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "حرّر ضاحية" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "قرية" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "حرّر قرية" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "قرية صغيرة" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "حرّر قرية صغيرة" @@ -28195,5 +28209,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "محلة" @@ -28201,10 +28215,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "حرّر محلة" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "جزيرة" @@ -28212,10 +28226,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "حرّر جزيرة" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "" @@ -28223,5 +28237,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "" @@ -28229,5 +28243,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "مدخل كهف" @@ -28235,10 +28249,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "حرّر مدخل كهف" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "قمّة" @@ -28246,10 +28260,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "حرّر قمّة" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "جليد" @@ -28257,10 +28271,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "حرّر جليد" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "بركان" @@ -28268,70 +28282,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "حرّر بركان" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "الحدود" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "دولية" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "حرّر حدود دولية" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "إدارية" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "حرّر حدود إدارية" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "مدنية" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "حرّر حدود إدارية" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "حرّر الحدود السياسية" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "محمية وطنية (بيئية)" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "حرّر محمية وطنية (التنوع البيئي)" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "إستعمال الأرض" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "شجرة" @@ -28340,15 +28354,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "حرّر شجرة" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "حرّر اإسم النباتي" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "حرج" @@ -28357,5 +28371,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "حرّر حرج" @@ -28363,17 +28377,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "صنوبري الثمر" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "مختلط" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "غابة" @@ -28382,14 +28396,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "حرّر غابة" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "محمية طبيعية" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "حرّر محمية طبيعية" @@ -28397,25 +28411,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "حصاة" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "حرّر حصاة" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "أشجار منخفضة" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "حرّر أشجار منخفضة" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "" @@ -28423,10 +28437,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "هوّة" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "" @@ -28434,5 +28448,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "حرّر أرض بور" @@ -28440,5 +28454,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "فناء مزرعة" @@ -28447,45 +28461,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "حرّر فناء مزرعة" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "أرض زراعية" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "حرّر أرض زراعية" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "مرج" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "حرّر مرج" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "كرم عنب" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "حرّر كرم عنب" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "حصص سكنية" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "حرّر حصص سكنية" @@ -28493,25 +28507,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "حديقة" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "حرّر حديقة" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "عشب" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "" @@ -28519,10 +28533,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "شائع" @@ -28530,20 +28544,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "حرّر شائع" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "متنزه" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "حرّر متنزه" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "ميدان ألعاب" @@ -28551,5 +28565,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "حرّر ميدان ألعاب" @@ -28557,15 +28571,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "منطقة سكنية" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "حرّر منطقة سكنية" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "مقبرة" @@ -28573,9 +28587,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "حرّر مقبرة" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "مقبرة" @@ -28583,39 +28597,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "حرّر إستعمال الأرض كمقبرة" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "بيع بلمفرق" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "حرّر بيع بلمفرق" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "تجاري" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "حرّر إستعمال تجاري للأرض" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "صناعي" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "حرّر الإستعمال الصناعي" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "أرض سكة حديد" @@ -28623,15 +28637,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "حرّر أرض سكة حديد" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "عسكري" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "حرّر الإستخدام العسكري للأرض" @@ -28639,50 +28653,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "موقع ورشة إعمار" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "حرّر موقع ورشة إعمار" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "حقل أخضر" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "حرّر إستعمال الأرض كحقل أخضر" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "مطمر نفايات" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "حرّر مطمر نفايات" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "كسّارة، مقلع حجارة" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "حرّر كسّارة / مقلع حجارة" @@ -28692,5 +28706,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "حرّر متعدد الضلوع" @@ -28702,5 +28716,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "الفلق الخارجي" @@ -28708,5 +28722,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "حرّر الفلق الخارجي" @@ -28714,5 +28728,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -28723,5 +28737,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -28729,36 +28743,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -28766,5 +28780,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "حصر الإنعطاف" @@ -28773,5 +28787,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "حرّر حصر الإنعطاف" @@ -28779,34 +28793,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "حصر" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "إنعطاف_يسار_ممنوع" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "إنعطاف_يمين_ممنوع" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "على_الطول_ممنوع" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "رجوع_ممنوع" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "إنعطاف_يميني_فقط" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "إنعطاف_يسار_ممنوع" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "على_الطول_فقط" @@ -28815,15 +28829,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "من الطريق" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "مروراً بلعقدة أو الطريق" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "إلى الطريق" @@ -28831,5 +28845,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "الطريق" @@ -28838,5 +28852,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "حرّر طريق" @@ -28844,5 +28858,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "نوع الطريق" @@ -28950,5 +28964,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -28959,17 +28973,17 @@ msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "حافلة (باص)" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "الطريق" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "عبارة بحرية" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "" @@ -29037,5 +29051,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29045,9 +29059,9 @@ msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "ترام" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "" @@ -29061,10 +29075,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "وصف الرمز" @@ -29072,31 +29086,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "الشبكة" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "المقترح" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "البديل" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "المؤقت" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "الإتصال" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "اللون (hex)" @@ -29105,30 +29119,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "فلق الطريق" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "الفلق الأمامي" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "الفلق الخلفي" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "نقطة التوقف" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "نقطة التوقف الأمامية" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "نقطة التوقف الخلفية" @@ -29355,5 +29369,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "مهجور" @@ -32681,11 +32695,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "المكان" @@ -32699,5 +32713,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" @@ -33053,4 +33067,7 @@ msgstr "" +#~ msgid "Football" +#~ msgstr "كرة القدم" + #~ msgid "Unknown version" #~ msgstr "نسخة مجهولة" Index: /applications/editors/josm/i18n/po/bg.po =================================================================== --- /applications/editors/josm/i18n/po/bg.po (revision 22208) +++ /applications/editors/josm/i18n/po/bg.po (revision 22209) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" "PO-Revision-Date: 2010-06-23 22:51+0000\n" "Last-Translator: bastik \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -243,5 +243,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -249,6 +249,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -336,8 +336,7 @@ msgstr "Няма слоеве за целта" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Добавяне на точка..." @@ -659,5 +658,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1042,5 +1041,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1049,5 +1048,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1185,4 +1184,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "" @@ -1459,6 +1459,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1681,6 +1681,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2313,5 +2311,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2557,10 +2555,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Търсене..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Търсене на обекти." @@ -2568,65 +2566,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Моля въведете филтър." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Моля, въведете низ за търсене." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "замени селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "добави към селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "изтрий от селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "търсене в селекцията" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "чувствителност към регистъра" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "регулярен израз" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "Baker Street - ''Baker'' и ''Street'' в кой да е ключ или име." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak - ''Bak'' където и да е в името." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - ключ ''type'' със стойност именно ''route''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2636,38 +2634,38 @@ "*=value, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - няма ''Bak'' в името." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - ключ=foot, независимо от стойността." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Специални цели:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" msgstr "тип: - тип на обекта (възел, път, връзка)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - всички обекти, променени от зададения потребител" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - обект с дадено ID (0 за нови обекти)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2675,5 +2673,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2681,5 +2679,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2687,5 +2685,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2693,9 +2691,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2703,21 +2701,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - всички променени обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - всички избрани обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - всички непълни обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - всички немаркирани обекти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2725,5 +2723,5 @@ "child израз - всички обекти наследници, отговарящи на израза" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2731,13 +2729,13 @@ "parent израз - всички родители на обектите отговарящи на израза" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "Използвайте | или OR за да обедините в логическо \"ИЛИ\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2745,12 +2743,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Използвайте ( и ) за да групирате изрази" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2759,38 +2757,51 @@ msgstr "Филтър" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Търсене" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Приемане на филтър" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Стартиране търсене" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "регулярен израз" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Не е намерено съвпадение за ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Нищо не е добавено към селекцията в резултат на търсенето за ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2798,5 +2809,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2804,5 +2815,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2810,5 +2821,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2816,5 +2827,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2943,8 +2954,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3085,5 +3096,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3213,11 +3224,11 @@ msgstr[1] "Преместване {0} възела" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Обектът ''{0}'' е изтрит" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3226,5 +3237,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3235,5 +3246,5 @@ "стойност - {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3271,5 +3282,5 @@ msgstr "Разрешаване {0} конфликтиращи маркери в релация {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3590,6 +3601,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3599,10 +3610,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3610,5 +3621,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3617,5 +3628,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3623,78 +3634,4 @@ #, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "П" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "С" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Текст" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "И" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "Р" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "З" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "Д" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "И" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "С" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -3826,5 +3763,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "фон" @@ -3996,5 +3933,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "железопътна линия" @@ -4015,7 +3952,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4082,7 +4019,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "сграда" @@ -4171,5 +4108,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4392,5 +4329,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4690,12 +4627,12 @@ msgstr "роля {0} не участва в двойката за сравнение {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Настройки" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4706,6 +4643,6 @@ msgstr "Маркери" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4713,6 +4650,6 @@ msgstr "Възли" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4720,9 +4657,9 @@ msgstr "Членове" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Няма чакащи tag конфликти за разрешаване" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4731,5 +4668,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4738,26 +4675,26 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Възли(решени)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Възли(с конфликт)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Членове (разрешени)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4765,25 +4702,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Членове (с конфликти)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Няма чакащи конфликти на характеристиките" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Характеристики (с конфликти)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Чакащи за разрешаване конфликти на характеристики" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Разрешение на конфликт" @@ -4829,5 +4766,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Моя версия" @@ -4838,5 +4775,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4852,5 +4789,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Тяхна версия" @@ -4919,5 +4856,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4929,5 +4866,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Надолу" @@ -5027,60 +4964,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Връзката със сървъра пропадна" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Да, възстанови от изтриване също" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "Не, отказване на операцията" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Възстановяване на изтрити допълнителни възли?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Възстановяване след изтриване на свързани примитиви?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Характеристики в моята база дании (локалната база данни)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5088,125 +4974,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Характеристики в тяхната база дании (базата данни на сървъра)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Координати:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Изтрито състояние:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Видимо състояние:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(никой)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "изтрито" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "не е изтрито" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "видимо (на сървъра)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "не е видимо (на сървъра)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Запазване копие на местната версия" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Физическо изтриване от местната база данни" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Запазване на моите координати" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Запазване на техните координати" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Да, нулирай ID" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "Нулирай ID" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Запазване на тяхното видимо състояние" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Да, изчисти го!" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM ще трябва да премахне вашият местен примитив с ID {0}
от " -"базата данни.
Съгласни ли сте?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Премахни от базата данни" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" msgstr "" @@ -5354,5 +5173,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "всички" @@ -5432,7 +5251,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5442,6 +5261,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5627,5 +5446,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5681,25 +5500,25 @@ msgstr "Изберете на картата всички обекти, избрани в списъка по-горе." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Прекъсни разрешаване на кофликти и затвори диалоговия прозорец" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Прилагане на разрешените конфликти и затваряне на диалоговия прозорец" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Прилагане на резолюцията" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Затваряне въпреки всичко" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Продължаване разрешаването на кофликти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5711,22 +5530,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "Конфликтът не е разрешен напълно" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Разрешаване на конфликти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Разрешаване на конфликти за ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5739,43 +5558,122 @@ msgstr "Добави" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Редактиране на филтъра" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "изтриване на филтъра" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Преместване филтъра нагоре" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Преместване филтъра надолу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Разрешаване на филтъра" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Скриване на елементи" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Обръщане на филтъра" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Режим на филтъра" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Грешка при зареждане на файла" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "П" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "С" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Текст" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "И" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "Р" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "З" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "Д" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "И" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "С" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5818,37 +5716,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Въведете координати за новата точка." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Използване на десетични градуси." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Отрицателни стойности обозначават западното/южното полукълбо" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Въведете геогр. ширина в диапазона [-90 .. 90]" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Въведете валидна геогр. дължина в диапазона [-180 .. 180]" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Въведете геогр. дължина в диапазона [-180 .. 180]" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "" @@ -5908,5 +5806,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Връзки" @@ -5954,10 +5852,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -6021,14 +5919,14 @@ msgstr "Избр.: Рел.:{0} / Пътища:{1} / Възли:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Избрано: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6731,8 +6629,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6757,6 +6663,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7139,69 +7043,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Име" @@ -7781,5 +7686,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8420,8 +8325,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Тип" @@ -8450,6 +8355,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "неизвестно" @@ -8778,5 +8683,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Забелязани са конфликти" @@ -9302,4 +9207,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9810,5 +9716,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Описание" @@ -9859,5 +9765,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -9936,23 +9842,23 @@ "смислено да се предположи тяхното време, бяха пропуснати." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Слой Данни {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "извън областта за сваляне" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9961,34 +9867,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -9997,32 +9880,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} се състои от:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "неустановена" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "API версия: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Преобразувай в слой GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -12988,4 +12871,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14447,5 +14331,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14718,5 +14602,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Интерполация на адреси" @@ -15150,36 +15034,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Мултиполигон" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "адрес" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Създаване на нова релация" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Сгради" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Номер" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Следващ" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Адреси" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15333,10 +15218,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15391,7 +15280,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15400,13 +15289,13 @@ msgstr "вода" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15454,32 +15343,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "адрес" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Включване автоматично кеширане." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Макс. размер на кеша (в MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15497,9 +15386,9 @@ "данни създадени с това разширение." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "Френски кадастров WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -15507,10 +15396,10 @@ "източници е включено" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Източник" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15519,5 +15408,5 @@ "Замени оригиналния бял фон с фоновия цвят определен в настройките на JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15527,132 +15416,136 @@ "текстове на тъмни фонове." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Позволяване на подреждане в няколко слоя" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Задаване прозрачност на WMS слоевете. Надясно - плътно, наляво - прозрачно." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Рисувай правоъгълник около зареденните от WMS сървър данни." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Взимане по-малки изображения (по-високо качество, но повече памет)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "Фиксирана площ (по подразбиране 100m2)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Фиксирана размер (от 25 до 1000 метра)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Най-старите файлове автоматично се изтриват когато този размер се премине" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15959,5 +15852,5 @@ msgstr "Комуна bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -15968,14 +15861,14 @@ "Моля, създайте нов кеш." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Грешка на кеш формата" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "Грешка в кеширането на Ламбертовата зона" @@ -17263,4 +17156,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17301,9 +17213,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -18819,5 +18726,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Друго" @@ -19005,5 +18912,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Мултиполигон" @@ -19534,5 +19441,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "област" @@ -19576,34 +19483,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Липсват данни" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19627,7 +19537,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Немаркирани пътища" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20550,7 +20459,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Отваряне на файл." +msgstr "" #. Strings in JFileChooser @@ -20855,7 +20763,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20864,10 +20779,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Предоставя маршрутизиращи възможности." #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20876,5 +20791,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20885,15 +20800,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Позволява добавянето на маркери/възли на текущата gps позиция." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Предоставя диалог за редактиране на маркери в табличен вид." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20907,10 +20822,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "Създава терасовидни къщи от един блок." #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20919,5 +20834,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20926,5 +20841,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20933,10 +20848,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20948,5 +20863,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20956,5 +20871,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20963,15 +20878,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20980,5 +20895,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21111,5 +21026,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Означение" @@ -21648,5 +21563,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "метал" @@ -21659,5 +21574,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "гора" @@ -21962,8 +21877,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "да" @@ -22074,8 +21989,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "не" @@ -22381,5 +22296,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "служебна" @@ -22499,5 +22414,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "туристически маршрут" @@ -22646,4 +22561,9 @@ msgid "Edit Motorway Junction" msgstr "Редактирай магистрален възел" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Номер" #. item "Waypoints/Motorway Junction" text "Number" @@ -22696,13 +22616,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Оператор" @@ -22970,6 +22890,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Надморска височина" @@ -23821,5 +23741,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Волтаж" @@ -24190,24 +24110,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Работно време" @@ -24274,23 +24194,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "денонощно" @@ -24304,23 +24224,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "понеделник-петък 08:30-20:00" @@ -24334,23 +24254,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "вторник-неделя 08:00-15:00; събота 08:00-12:00" @@ -24464,6 +24384,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Ref номер" @@ -24479,5 +24399,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "подземен" @@ -24491,5 +24411,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Такса" @@ -24665,5 +24585,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Инвалидна количка" @@ -24701,5 +24621,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Навес" @@ -24707,5 +24627,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Скамейка" @@ -24824,5 +24744,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Маяк / Радиопредавател" @@ -25561,5 +25481,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Спорт" @@ -25634,5 +25554,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25746,12 +25714,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25818,12 +25778,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25837,12 +25789,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -26004,5 +25948,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "спорт" @@ -26029,4 +25974,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "австралийски футбол" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "австралийски футбол" @@ -26054,4 +26005,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "австралийски футбол" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "кану" @@ -26094,6 +26051,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "футбол" +#, fuzzy +msgid "gaelic_football" +msgstr "австралийски футбол" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26134,5 +26092,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "ръгби" @@ -26253,6 +26217,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26266,5 +26234,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26286,4 +26253,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "тип" @@ -26307,6 +26276,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26319,5 +26292,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26339,4 +26311,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "игрище" @@ -26359,4 +26333,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "спортен център" @@ -26379,4 +26355,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "стадион" @@ -26399,4 +26377,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "следа" @@ -26598,158 +26578,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Американски футбол" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Редактирай американски футбол" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Австралийски футбол" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Редактирай австралийски футбол" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Австралийски футбол" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Редактирай австралийски футбол" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Редактирай американски футбол" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Редактирай австралийски футбол" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Редактирай американски футбол" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Редактирай американски футбол" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Редактирай ръгби" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Ръгби" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Редактирай ръгби" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Бейсбол" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Редактирай бейсбол" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Баскетбол" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Редактирай баскетбол" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Голф" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Редактирай голф" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "поле за голф" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Буле (игра с мет.топчета)" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Редактирай Игра с мет.топчета" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Игра с асим.мет.топки (bowls)" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Редактирай игра с асим.мет.топки" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Крикет" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Редактирай крикет" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Крикет мрежи" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Рекдатирай крикет мрежи" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Крокет" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Редактирай крокет" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Хокей" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Редактирай хокей" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Пелота" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Редактирай пелота" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "ракет" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Редактирай ракет" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Ръгби" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Редактирай ръгби" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Тенис на маса" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Редактирай тенис на маса" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Тенис" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Редактирай тенис" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Изкуствени" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Сграда" @@ -26757,5 +26773,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Обществена сграда" @@ -26763,10 +26779,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Редактирай обществена сграда" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Кметство" @@ -26774,10 +26790,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Редактирай кметство" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Посолство" @@ -26785,10 +26801,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Редактирай посолство" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Съдебна сграда" @@ -26797,10 +26813,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Редактирай съдебна сграда" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Затвор" @@ -26809,10 +26825,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Редактирай затвор" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Полиция/Милиция" @@ -26822,10 +26838,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Редактирай полиция/милиция" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Пожарна" @@ -26834,10 +26850,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Редактирай пожарна" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Пощенска станция" @@ -26845,5 +26861,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Редактирай пощенска станция" @@ -26851,15 +26867,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Детска градина" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Редактирай детска градина" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Училище" @@ -26867,10 +26883,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Редактирай училището" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Университет" @@ -26878,10 +26894,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Редактирай университет" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Колеж" @@ -26889,5 +26905,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Редактирай колеж" @@ -26895,5 +26911,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Кино" @@ -26902,10 +26918,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Редактирай кино" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Библиотека" @@ -26914,9 +26930,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Редактирай библиотека" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Център на изкуствата" @@ -26924,10 +26940,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Редактирай център на изкуствата" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Театър" @@ -26936,10 +26952,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Редактирай театър" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Място за богослужение" @@ -26949,5 +26965,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Редактирай място за богослужение" @@ -26956,6 +26972,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Религия" @@ -26964,66 +26980,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "Бахаи" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "Будизъм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "Християнство" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "Индуизъм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "Джайнизъм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "Юдаизъм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "Мусулманство" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "Сикхизъм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "Спиритуализъм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "Даосизъм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "Унитаристи" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "Зороастризъм" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Конфесия" @@ -27032,81 +27048,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "Англиканска" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "Баптизъм" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "Католическо" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "Евангелска" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "Свидетели на Йехова" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "Лютеранство" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "Методизъм" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "Мормони" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "Православие" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "Петдесетници" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "Пресвитериани" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "Протестантизъм" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "Кваркери" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "Шийти" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "Сунити" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Адреси" @@ -27115,5 +27131,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Редактиране на информацията за адреса" @@ -27121,5 +27137,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Номер" @@ -27127,25 +27143,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Име на дом" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Име на улица" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Име на град" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Пощенски код" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Код на държава" @@ -27154,5 +27170,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Редактирай интерполация на адреси" @@ -27160,61 +27176,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Схема на номериране" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "нечетни" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "четни" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "по азбучен ред" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Изкуствени" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Цех" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Редактирай цех" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Кула" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Редактирай кула" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "Тип на кулата" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Височина (в метри)" @@ -27222,25 +27238,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Водонапорна кула" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Редактирай водонапорна кула" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Газохранилище" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Редактирай газохранилище" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Маяк / Светлинен фар" @@ -27248,10 +27264,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Редактирай маяк / светлинен фар" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Мелница" @@ -27259,10 +27275,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Редактирай мелница" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Тръбопровод" @@ -27271,41 +27287,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Редактирай газопровод" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "газ" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "нефт" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "отходна тръба" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Местоположение" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "подводно" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Пречиствателна станция" @@ -27315,10 +27331,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Редактирай пречиствателна станция" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Кран" @@ -27326,5 +27342,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Редактирай кран" @@ -27332,10 +27348,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Редактирай маяк / радиопредавател" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Точка на наблюдение" @@ -27343,10 +27359,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Редактирай точка на наблюдение" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Видеонаблюдение" @@ -27354,23 +27370,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Редактирай видеонаблюдение" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Електроцентрала" @@ -27380,35 +27396,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Редактирай електрогенератор" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "вятърна енергия" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "водна енергия" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "енергия от изкопаеми горива" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "атомна" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "въглища" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "слънчева енергия" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Електростанция" @@ -27417,10 +27433,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Редактирай електростанция" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Електроподстанция" @@ -27429,5 +27445,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Редактирай електроподстанция" @@ -27435,10 +27451,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Номер линия" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Електрически стълб от ЕПМ" @@ -27449,23 +27465,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Редактирай стълб от ЕПМ" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "кула" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Линия за електропренос" @@ -27474,74 +27490,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Редактирай линия за електропренос" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Тип на линия" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "линия" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "второстепенна линия" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Брой проводници" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Брой на жилата на всеки кабел" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "един" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "два" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "три" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "четири" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Обществени удобства" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Тоалетни" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Забележка" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Пощенска кутия" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Телефон" @@ -27550,5 +27566,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Редактирай телефон" @@ -27556,5 +27572,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Монети" @@ -27562,5 +27578,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Банкноти" @@ -27568,5 +27584,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Електрони средства за разплата" @@ -27574,5 +27590,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Дебитни карти" @@ -27580,15 +27596,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Кредитни карти" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Телефонни карти" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Рециклиране" @@ -27597,5 +27613,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Редактиране на станция за рециклиране" @@ -27603,35 +27619,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Батерии" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Консервни кутии" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Дрехи" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Стъкло" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Хартия" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Вторични суровини" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "" @@ -27639,5 +27655,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "" @@ -27646,31 +27662,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Материал" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "камък" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "пластмаса" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Цвят" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "черно" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "кафяво" @@ -27749,5 +27765,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27757,31 +27773,31 @@ msgstr "зеленина" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "червено" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "синьо" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "сиво" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "бяло" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Брой седящи места" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Ловно скривалище" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Редактирай ловно скривалище" @@ -27790,30 +27806,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Височина" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "нисък" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "среден" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "пълен" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Скривалище" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Заключване" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Фонтан" @@ -27822,10 +27838,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Редактирай фонтан" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Питейна вода" @@ -27834,10 +27850,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Редактирай питейна вода" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Пожарен кран" @@ -27846,5 +27862,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "редактиране на \"Пожарен кран\"" @@ -27852,5 +27868,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Дестка ясла" @@ -27858,15 +27874,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Редактирай детска ясла" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Магазини" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Автомобили" @@ -27874,10 +27890,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Редактирай автосалон" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Велосипеди" @@ -27886,28 +27902,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Редактирай вело-магазин" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Супермаркет" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Редактирай супермаркет" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Аптека" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Редактиране на: аптека" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Хранителни стоки" @@ -27915,9 +27931,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Редактиране на \"магазин за хранителни стоки\"" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Будка" @@ -27925,27 +27941,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Редактирай будка" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Книжарница" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Редактиране на книжарница" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Туристическа агенция" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Редактиране на туристическа агенция" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Месарница" @@ -27953,9 +27969,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Редактирай месарница" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Фурна" @@ -27963,9 +27979,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Редактирай фурна" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Цветарски магазин" @@ -27973,18 +27989,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Редактирай цветарски магазин" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Био магазин" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Редактирай био магазин" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Алкохол" @@ -27992,54 +28008,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Редактиране магазин за алкохол" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Напитки" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Редактиране магазин за безалкохолни" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Компютри" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Редактирай компютърен магазин" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Електроника" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Редактирай магазин за електроника" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Аудио HiFi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Редактирай магазин за Аудио HiFi" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Мебелен магазин" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Редактирай мебелен магазин" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Градински център" @@ -28047,9 +28063,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Редактирай градински център" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Железария" @@ -28057,9 +28073,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Редактирай железария" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Магазин \"Направи си сам\"" @@ -28067,54 +28083,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Редактирай магазин \"Направи си сам\"" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Книжарница" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Редактирай книжарница" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Фризьорски салон / козметика" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Редактирай фризьорски салон / козметика" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Обувки" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Редактирай магазин за обувки" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Играчки" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Редактирай магазин за играчки" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Видео" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Редактирай Видео-магазин" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Химическо чистене" @@ -28122,9 +28138,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Редактирай химическо чистене" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Пералня" @@ -28132,9 +28148,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Редактирай пералня" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Туристически стоки (за активен отдих)" @@ -28142,24 +28158,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Редактирай мазизин за туристически стоки" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Редактирай магазин за спортни стоки" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Оптика" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Редактирай оптика" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Автомат за стоки" @@ -28167,5 +28183,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Редактирай автомат за стоки" @@ -28173,97 +28189,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Продукти за автоматична продажба" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "билети за обществен транспорт" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "карта на обществен транспорт" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "билети за паркиране" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "храна" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "напитки" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "сладки" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "цигари" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "фотографии" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "храна за животни" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "вестници" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "играчки" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "пощенски марки" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-карти" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "телефонни ваучери" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "ваучери" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "презервативи" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "тампони" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "торби за екскременти" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "клиентски карти" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Пари" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Банка" @@ -28271,14 +28287,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Редактирай банка" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Банкомат" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Обмяна на валута" @@ -28286,5 +28302,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Редактирай обмяна на валута" @@ -28292,15 +28308,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Редактирай банкомат" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Здраве" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Лекар" @@ -28308,18 +28324,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "редактиране на \"Лекар\"" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Стоматолог" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Редактирай стоматолигия" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Аптека" @@ -28327,5 +28343,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Редактирай аптека" @@ -28333,9 +28349,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Приготвят лекарства по рецепти" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Болница" @@ -28343,10 +28359,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Редактирай болница" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Пункт за връзка със спешна помощ" @@ -28355,5 +28371,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Редактирай пункт за връзка със спешна помощ" @@ -28362,20 +28378,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Номер на пункта" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Име на пункта" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Телефонен номер" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Използвайте международен код, като например +12-345-67890)" @@ -28383,5 +28399,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Ветеринар" @@ -28390,64 +28406,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Редактирай ветеринар" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "География" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Места" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Континент" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Редактирай континент" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Държава" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Редактирай държава" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Област/Щат" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Редактирай област/щат" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Област" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Редактирай област" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Графство" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Редактирай графство" @@ -28455,15 +28471,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Град (над 100 000)" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Редактирай голям град" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Град (под 100 000)" @@ -28471,10 +28487,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Редактирай град" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Квартал/предградие" @@ -28482,25 +28498,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Редактирай квартал" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Село" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Редактирай село" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Махала" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Редактирай махала" @@ -28508,5 +28524,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Местност" @@ -28514,10 +28530,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Редактирай местност" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Остров" @@ -28525,10 +28541,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Редактирай остров" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Скала" @@ -28536,5 +28552,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Редактиране на: скала" @@ -28542,5 +28558,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Пещерен вход" @@ -28548,10 +28564,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Редактиране пещерен вход" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Връх" @@ -28559,10 +28575,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Редактиране връх" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Ледник" @@ -28570,10 +28586,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Редактиране ледник" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Вулкан" @@ -28581,70 +28597,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Редактиране вулкан" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Граници" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Национална" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Редактирай национална граница" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Административна" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Редактирай административна граница" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Гражданска" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Редактирай гражданска граница" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Политическа" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Редактирай политическа граница" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Национален парк" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Редактирай граница национален парк" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Земеползване" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Дърво" @@ -28653,15 +28669,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Редактирай дърво" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Ботаническо название" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Гора" @@ -28670,5 +28686,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Редактирай гората" @@ -28676,17 +28692,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "иглолистен" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "широколистен" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "смесен" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Гора" @@ -28695,14 +28711,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Редактирай гора" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Природен резерват" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Редактирай природен резерват" @@ -28710,25 +28726,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Сипей" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Редактирай сипей" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Шубрак" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Редактирай шубрака" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Скалист склон" @@ -28736,10 +28752,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Редактирай скалист склон" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Пустош" @@ -28747,5 +28763,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Редактиране пустош" @@ -28753,5 +28769,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Двор ферма" @@ -28760,45 +28776,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Редактирай двор ферма" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Обработваема земя" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Редактирай обработваема земя" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Поляна" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Редактиране поляна" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Лозе" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Редактирай лозе" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Земя за лично ползване" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Редактиране на: Земя за лично ползване" @@ -28806,25 +28822,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Градина" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Редактирай градина" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Трева" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Редактирай трева" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Зелено село" @@ -28832,10 +28848,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Редактирай зелено селище" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Общи" @@ -28843,20 +28859,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Редактирай общи" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Парк" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Редактирай парк" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Спортна площадка" @@ -28864,5 +28880,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Редактирай спортна площадка" @@ -28870,15 +28886,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Жилищна зона" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Редактирай жилищна зона" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Църковно гробище" @@ -28886,9 +28902,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Редактирай църковно гробище" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Гробище" @@ -28896,39 +28912,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Редактирай гробище" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Търговия на дребно" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Редактирай търговия на дребно" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Търговия" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Редактирай търговия" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Промишленост" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Редактирай промишленост" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Железопътен път" @@ -28936,15 +28952,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Редактирай ЖП" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Военен" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Редакирай военна земя" @@ -28952,50 +28968,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Строителна площадка" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Редактирай строителна площадка" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Индустриални развалини" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Редактирай ундустриални развалини" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Зелени площи" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Редактирай зелени площи" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Сметище" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Редактирай сметище" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Кариера" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Редактирай кариера" @@ -29005,5 +29021,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Редактиране мултиполигон" @@ -29015,5 +29031,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "външен сегмент" @@ -29021,5 +29037,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "вътрешен сегмент" @@ -29027,5 +29043,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -29036,5 +29052,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -29042,36 +29058,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -29079,5 +29095,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Ограничения при завиване" @@ -29086,5 +29102,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Редактиране на ограничения при завиване" @@ -29092,34 +29108,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Ограничения" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "забранен ляв завой" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "забранен десен завой" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "забранено напред" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "забранен обратен завой" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "само десен завой" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "само ляв завой" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "само направо" @@ -29128,15 +29144,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "от път" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "през точка или път" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "до път" @@ -29144,5 +29160,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Маршрут" @@ -29151,5 +29167,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Редактиране маршрут" @@ -29157,5 +29173,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Тип маршрут" @@ -29263,5 +29279,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29272,17 +29288,17 @@ msgstr "велосипед" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "автобус" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "път" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "ферибот" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "ски" @@ -29350,5 +29366,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29358,9 +29374,9 @@ msgstr "пеш" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "трамваен маршрут" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "обиколка" @@ -29374,10 +29390,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "метро" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Описание на символ" @@ -29385,31 +29401,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Мрежа" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "Състояние на пътя" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "предложен" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "алтернативен" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "временен" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "връзка" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Цвят (hex)" @@ -29418,30 +29434,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "сегмент от маршрут" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "сегмент напред" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "сегмент назад" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "точка за спиране" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "точка за спиране напред" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "точка за спиране назад" @@ -29668,5 +29684,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "остарял, вече невалиден" @@ -32994,11 +33010,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "място" @@ -33012,5 +33028,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" @@ -33365,4 +33381,62 @@ msgid "Sicily - Italy" msgstr "Сицилия - Италия" + +#~ msgid "Communication with server failed" +#~ msgstr "Връзката със сървъра пропадна" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Да, възстанови от изтриване също" + +#~ msgid "No, cancel operation" +#~ msgstr "Не, отказване на операцията" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Възстановяване на изтрити допълнителни възли?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Възстановяване след изтриване на свързани примитиви?" + +#~ msgid "Visible State:" +#~ msgstr "Видимо състояние:" + +#~ msgid "visible (on the server)" +#~ msgstr "видимо (на сървъра)" + +#~ msgid "not visible (on the server)" +#~ msgstr "не е видимо (на сървъра)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Запазване копие на местната версия" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Физическо изтриване от местната база данни" + +#~ msgid "Yes, reset the id" +#~ msgstr "Да, нулирай ID" + +#~ msgid "Reset id to 0" +#~ msgstr "Нулирай ID" + +#~ msgid "Keep their visible state" +#~ msgstr "Запазване на тяхното видимо състояние" + +#~ msgid "Yes, purge it" +#~ msgstr "Да, изчисти го!" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM ще трябва да премахне вашият местен примитив с ID {0}
от " +#~ "базата данни.
Съгласни ли сте?" + +#~ msgid "Remove from dataset" +#~ msgstr "Премахни от базата данни" + +#~ msgid "football" +#~ msgstr "футбол" + +#~ msgid "Football" +#~ msgstr "Американски футбол" #~ msgid "" Index: /applications/editors/josm/i18n/po/cs.po =================================================================== --- /applications/editors/josm/i18n/po/cs.po (revision 22208) +++ /applications/editors/josm/i18n/po/cs.po (revision 22209) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-27 16:26+0000\n" -"Last-Translator: Jezevec \n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-28 15:41+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:53+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:06+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -244,5 +244,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -250,6 +250,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -337,8 +337,7 @@ msgstr "Žádné cílové vrstvy" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Přidat uzel..." @@ -659,5 +658,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1041,5 +1040,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1048,5 +1047,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1185,4 +1184,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Přesunout uzel..." @@ -1463,6 +1463,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1685,6 +1685,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2324,5 +2322,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2566,10 +2564,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Hledat..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Hledat objekty." @@ -2577,67 +2575,67 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Prosím zadejte řetězec filtru" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Zadjte hledaný řetězec." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Zadejte hledaný výraz" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "nahradit označené" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "přidat k výběru" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "odebrat z výběru" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "Najít ve výběru" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "velikost písmen rozhoduje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "všechny objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "regulární výraz" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" "Baker Street - ''Baker'' a ''Street'' v jakémkoliv klíči nebo jménu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" "\"Baker Street\" - ''Baker Street'' v jakémkoliv klíči nebo jménu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak - ''Bak'' kdekoliv ve jménu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - klíč ''type'' s hodnotou přesně 'route'." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2647,30 +2645,30 @@ "*=value, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - neobsahuje ''Bak'' ve jménu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "oneway? - oneway=yes, true, 1 nebo on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - klíč 'foot' nastavený na jakoukoliv hodnotu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Speciální cíle:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" msgstr "type: - typ objektu (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - všechny objekty změněné uživatelem" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" @@ -2678,9 +2676,9 @@ "uživatelem" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - objekt s daným ID (0 pro nové objekty)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2689,5 +2687,5 @@ "verze:... - objekt s danou verzí (0 objektů bez přidělené verze)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2697,5 +2695,5 @@ "sady změn)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2705,5 +2703,5 @@ "max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2712,9 +2710,9 @@ "tags:... - objekt s daným počtem tagů (tags:počet nebo tags:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "role:... - objekt s danou rolí v relaci" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2722,21 +2720,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - všechny změněné objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - všechny vybrané objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "nekompletní - všechny nekompletní objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - všechny objekty bez tagů" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2744,5 +2742,5 @@ "child výraz - všechny podobjekty objektů odpovídajících výrazu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2750,14 +2748,14 @@ "parent výraz - všechny rodiče objektů odpovídajících výrazu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "Použijte | nebo OR ke kombinaci s logickým \"nebo\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" "Použíjte \" k uvození operátorů (např. když klíč obsahuje :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2765,12 +2763,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Použijte ( a ) k seskupení výrazů" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2779,38 +2777,51 @@ msgstr "Filtrovat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Hledat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Přidat filtr" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Začít hledání" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Zadejte hledaný výraz" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Nebyly nalezeny záznamy pro \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nic nebylo přidáno výběrem hledáním \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nic nebylo odstraněno výběrem hledáním \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Ve výběru se nenašlo nic při hledání ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2818,5 +2829,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2824,5 +2835,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2830,5 +2841,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2836,5 +2847,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2965,8 +2976,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3108,5 +3119,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3238,11 +3249,11 @@ msgstr[2] "Přesunout uzly {0}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Odstraněný objekt ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3252,5 +3263,5 @@ msgstr[2] "Odstraněno {0} objektů" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3261,5 +3272,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3298,5 +3309,5 @@ msgstr "Vyřešení {0} konfliktů tagů v relaci {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3613,6 +3624,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3622,10 +3633,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3633,5 +3644,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3640,5 +3651,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3647,79 +3658,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Text" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

Filtrování je aktivní

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} objektů skryto" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "{0} objektů deaktivováno" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "" -"

Uzavřete filtrovací dialog pro zobrazení všech objektů.

" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3853,5 +3789,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "pozadí" @@ -3977,7 +3913,6 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (Francie)" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 @@ -4022,5 +3957,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "železnice" @@ -4041,7 +3976,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4109,7 +4044,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "budova" @@ -4199,5 +4134,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4422,5 +4357,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4732,12 +4667,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4748,6 +4683,6 @@ msgstr "Značky" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4755,6 +4690,6 @@ msgstr "Body" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4762,9 +4697,9 @@ msgstr "Členové" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Nezbývají žádné další konflikty značek k vyřešení" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4774,5 +4709,5 @@ msgstr[2] "Tagy({0} konfliktů)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4781,26 +4716,26 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Body(vyřešeno)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Body(s konflikty)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Nevyřešené konflikty v seznamu bodů v této cesty" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Členové(vyřešeno)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4808,25 +4743,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Členi (s konflikty)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Nevyřešené konflikty v seznamu členů této relace" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Nezbývají žádné konflikty ve vlastnostech" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Vlastnosti (s konflikty)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Zbývající konflikty k vyřešení ve vlastnostech" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Řešení konfliktů" @@ -4872,5 +4807,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Má verze" @@ -4881,5 +4816,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4893,5 +4828,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Cizí verze" @@ -4967,5 +4902,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4977,5 +4912,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Dolu" @@ -5083,60 +5018,9 @@ msgstr "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "Při komunikaci se serverem doslo k chybě
Detaily: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Komunikace se serverem selhala" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Ano, obnovit je také" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "Ne, zruš operaci" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Obnovit další body?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Obnovit závislé prvky?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Vlastnosti v mé datové sadě, např lokální datové sadě" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5146,126 +5030,59 @@ "sloučení aplikováno." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Vlastnosti v cizí datové sadě, např serverová datová sada" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Souřadnice:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Stav smazáno:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Stav viditelné:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "Odkazováno z:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(žádný)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "smazáno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "nesmazáno" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "viditelný (na serveru)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "neviditelný (na serveru)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Ponechat klon lokální verze" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Fyzicky odstranit z lokální datové sady" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Ponechat mé souřadnice" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Ponechat cizí souřadnice" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "Nerozhodnutý konflikt rozdílných souřadnic" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "Ponechat můj stav vymazáno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "Ponechat cizí stav vymazáno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "Nerozhodnutý konflikt stavu vymazáno" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "Ponechat můj stav viditelné" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Ano, resetovat id" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "Resetovat id na 0" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Ponechat cizí stav viditelné" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Ano, vyčistit to" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM odstraní lokální prvek s id {0}
z datové sady.
Souhlasíte?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Odstranit z datové sady" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "Nerozhodnutý konflikt stavu viditelné" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5412,5 +5229,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "všechny" @@ -5491,7 +5308,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5502,6 +5319,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5696,5 +5513,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5752,25 +5569,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Zrušit řešení konfliktu a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Aplikovat řešení konfliktů a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Aplikovat řešení" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Přesto zavřít" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Pokračovat v řešení" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5782,22 +5599,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "Konflikt není vyřešen kompletně" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Vyřešit konflikty" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Vyřešit konflikty pro ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Filtruje objekty a schová/zneaktivní je." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5810,44 +5627,124 @@ msgstr "Přidat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "Přidat filtr." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Upravit filtr." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Smazat filtr." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Přesunout filtr nahoru." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Přesunout filtr dolu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Aktivovat filtr." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Skrýt elementy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Negovat filtr" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Mód filtrování" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Chyba při nahrávání souboru" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Text" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

Filtrování je aktivní

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} objektů skryto" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "{0} objektů deaktivováno" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "" +"

Uzavřete filtrovací dialog pro zobrazení všech objektů.

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -5889,37 +5786,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Zadejte souřadnice nového uzlu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Použijte desetinné stupně." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Záporné hodnoty znamenají západní, resp. jižní polokouli." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Prosím zadejte platnou zeměpisnou šířku v rozsahu -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Prosím zadejte zeměpisnou šířku v rozsahu -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Prosím zadejte platnou zeměpisnou délku v rozsahu -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Prosím zadejte zeměpisnou délku v rozsahu -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Zavřít dialog a vytvořit nový bod" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Zavřít dialog a nevytvořit nový bod" @@ -5979,5 +5876,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relace" @@ -6025,10 +5922,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "Stáhnout nekompletní členy vybraných relací" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "Stáhnout nekompletní členy" @@ -6092,14 +5989,14 @@ msgstr "Výběr: Rel.:{0} / Cest:{1} / Uzlů:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Výběr: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "Prozkoumat" @@ -6807,8 +6704,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6833,6 +6738,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7215,69 +7118,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Název" @@ -7867,5 +7771,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8524,8 +8428,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Typ" @@ -8554,6 +8458,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "neznámý" @@ -8893,5 +8797,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Objeveny konflikty" @@ -9429,4 +9333,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9962,5 +9867,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Popis" @@ -10013,5 +9918,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10088,23 +9993,23 @@ "byly vynechány." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Datová vrstva {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "mimo stažený areál" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "verze {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: 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" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10114,48 +10019,11 @@ msgstr[2] "Bylo nalezeno {0} konfliktů." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -"{0} konflikt byl vyřešen automaticky odstraněním {0} " -"objektu
z lokální datové sady protože byl vymazán na serveru." -msgstr[1] "" -"{0} konflikty byly vyřešeny automaticky odstraněním {0} " -"objektů
z lokální datové sady protože byly vymazány na serveru." -msgstr[2] "" -"{0} konfliktů bylo vyřešeno automaticky odstraněním {0} " -"objektů
z lokální datové sady protože byly vymazány na serveru." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"{0} konflikt zbývá k řešení.

Prosím otevřete seznam konfliktů a " -"vyřešte jej manuálně." -msgstr[1] "" -"{0} konflikty zbývají k řešení.

Prosím otevřete seznam konfliktů a " -"vyřešte je manuálně." -msgstr[2] "" -"{0} konfliktů zbývá k řešení.

Prosím otevřete seznam konfliktů a " -"vyřešte je manuálně." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "Klikněte pro uzavření tohoto dialogu a návrat k editaci" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10165,32 +10033,32 @@ msgstr[2] "{0} smazáno" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} se skládá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "nenastaveno" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "Verze API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Převédst do GPX vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "Test konzistence dat" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "Nenalezen žádný problém" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "Nalezeny následující problémy:" @@ -13186,4 +13054,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14691,5 +14560,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14958,5 +14827,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Interpolace adres" @@ -15390,36 +15259,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Multipolygon" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "adresa" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Vytvořit novou relaci" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Budovy" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Číslo" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Další" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Ulice" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Adresy" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15581,10 +15451,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15639,7 +15513,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15648,13 +15522,13 @@ msgstr "voda" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15702,32 +15576,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "adresa" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Zapnout automatické cachování." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Max. velikost cache (v MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15739,19 +15613,19 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "WMS francouzského katastru" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" "Hodnota klíče \"source\" pokud je zapnuto automatické zdrojování" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Zdroj" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15760,5 +15634,5 @@ "Nahradit původní bílé pozadí barvou pozadí nastavenou v nastavení JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15768,132 +15642,136 @@ "texty na tmavém pozadí." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Povolit skládání více vrstev" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Nastavení průhlednosti WMS vrstvy. Vpravo je neprůhledné, vlevo průhledné." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Zobrazovat rámeček kolem dat stažených z WMS serveru." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "Rozlišení obrázku:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "Vysoké rozlišení (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "Střední rozlišení (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "Nízké rozlišení (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Stahovat menší obrázky (lepší kvalita, ale používá více paměti)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "Fixní velikost čtverce (výchozí je 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fixní velikost (od 25 do 1000 metrů)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "Vrstvy:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "Parcely." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "Čísla parcel, jména ulic." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "adresy, čísla domů." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "Sekce a podsekce katastru." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "Administrativní hranice samospráv." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Nejstarší soubory jsou automaticky smazány při překročení této velikosti" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16204,5 +16082,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -16213,9 +16091,9 @@ "Vytvořte nový soubor." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Chyba formátu cache" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -16223,5 +16101,5 @@ "Lambertova zóne {0} v cache nekompatibilní se současnou Lambertovou zónou {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "Chyba Lambertovy zóny v cache" @@ -17508,4 +17386,26 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +#, fuzzy +msgid "Create Stops from GTFS ..." +msgstr "Vytvořit zastávky z GPX souboru" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +#, fuzzy +msgid "Create Stops from a GTFS file" +msgstr "Vytvořit zastávky z GPX souboru" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "Nastala IOException \"{0}\"" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +#, fuzzy +msgid "GTFS-Stops" +msgstr "Zastávky" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17547,9 +17447,4 @@ msgid "Create Stops from a GPX file" msgstr "Vytvořit zastávky z GPX souboru" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" -msgstr "Nastala IOException \"{0}\"" #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83 @@ -19074,5 +18969,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Ostatní" @@ -19261,5 +19156,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Multipolygon" @@ -19784,5 +19679,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "oblast" @@ -19825,34 +19720,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Žádná data" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19875,7 +19773,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Neotagované cesty" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20689,7 +20586,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:23 -#, fuzzy msgid "Abort file chooser dialog" -msgstr "Zrušit dialog na vybrání souboru." +msgstr "" #. Strings in JFileChooser @@ -20801,7 +20697,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Otevřít vybraný soubor." +msgstr "" #. Strings in JFileChooser @@ -21106,7 +21001,14 @@ msgstr "Plugin pro vracení sad změn zpět (revert)" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21117,10 +21019,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Poskytuje směrování" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21129,5 +21031,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21138,15 +21040,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Umožní přidat ukazatele/body na současnou GPS polohu." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Poskytuje dialog umožňující editovat tagy v tabulce." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21156,10 +21058,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "Vytváření řadových domků z jednotlivých bloků." #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21168,5 +21070,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21177,5 +21079,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21186,10 +21088,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "Umožňuje obnovování smazaných objektů z OSM databáze" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21200,5 +21102,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21208,5 +21110,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21217,15 +21119,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "Snadné stahovaní velmi dlouhých propojených cest" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "Vyberte sekvenci nevětvících se spojených cest" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21234,5 +21136,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21366,5 +21268,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Číslo" @@ -21903,5 +21805,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "kov" @@ -21914,5 +21816,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "Prales" @@ -22217,8 +22119,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "ano" @@ -22329,8 +22231,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "ne" @@ -22636,5 +22538,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "obslužná cesta" @@ -22754,5 +22656,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "turistická" @@ -22901,4 +22803,9 @@ msgid "Edit Motorway Junction" msgstr "Upravit křižovatku dálnic" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Číslo" #. item "Waypoints/Motorway Junction" text "Number" @@ -22951,13 +22858,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operátor" @@ -23225,6 +23132,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Nadmořská výška" @@ -24076,5 +23983,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Napětí" @@ -24445,24 +24352,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Otevírací doba" @@ -24529,23 +24436,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24/7" @@ -24559,23 +24466,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "Po-Pá 08:30-20:00" @@ -24589,23 +24496,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Út-Ne 08:00-15:00; So 08:00-12:00" @@ -24719,6 +24626,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Číslo záchodu" @@ -24734,5 +24641,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "podzemní" @@ -24746,5 +24653,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Poplatek" @@ -24920,5 +24827,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Invalidní vozík" @@ -24956,5 +24863,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Přístřešek" @@ -24962,5 +24869,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Lavička" @@ -25079,5 +24986,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Vodní bój" @@ -25816,5 +25723,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Sportovní potřeby" @@ -25889,5 +25796,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -26001,12 +25956,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26073,12 +26020,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26092,12 +26031,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -26259,5 +26190,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "sport" @@ -26284,4 +26216,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "australský fotbal" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "australský fotbal" @@ -26309,4 +26247,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "australský fotbal" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "kanoistika" @@ -26349,6 +26293,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "fotbal" +#, fuzzy +msgid "gaelic_football" +msgstr "australský fotbal" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26389,5 +26334,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "ragby" @@ -26508,6 +26459,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26521,5 +26476,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26541,4 +26495,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "typ" @@ -26562,6 +26518,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26574,5 +26534,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26594,4 +26553,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "hřiště" @@ -26614,4 +26575,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "sportovní centrum" @@ -26634,4 +26597,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "stadion" @@ -26654,4 +26619,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -26853,158 +26820,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Fotbal" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Upravit fotbal" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Australský fotbal" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Upravit australský fotbal" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Australský fotbal" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Upravit australský fotbal" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Upravit fotbal" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Upravit australský fotbal" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Upravit fotbal" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Upravit fotbal" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Upravit ragby" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Ragby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Upravit ragby" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Upravit baseball" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Basketbal" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Upravit basketbal" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Upravit Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "golfové hřiště" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Hry s koulemi (např. pétanque)" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Upravit hry s koulemi (např. pétanque)" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Bowls" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Upravit Bowls" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Kriket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Upravit kriket" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Ohražené místo pro tréning kriketu" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Upravit ohražené místo pro tréning kriketu" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Kroket" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Upravit kroket" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hokej" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Upravit hokej" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelota (míčová hra)" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Upravit pelotu (míčová hra)" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Pálkové (raketové) sporty" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Upravit pálkové (raketové) sporty" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Ragby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Upravit ragby" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Stolní tenis (ping-pong)" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Upravit stolní tenis (ping-pong)" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tenis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Upravit tenis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Objekty a další POI" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Budova" @@ -27012,5 +27015,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Veřejná budova" @@ -27018,10 +27021,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Upravit veřejnou budovu" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Radnice" @@ -27029,10 +27032,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Upravit radnici" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Ambasáda" @@ -27040,10 +27043,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Upravit ambasádu" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Soud" @@ -27052,10 +27055,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Upravit soud" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Vězení" @@ -27064,10 +27067,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Upravit vězení" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Policie" @@ -27077,10 +27080,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Upravit policii" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Hasičská stanice" @@ -27089,10 +27092,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Upravit hasičskou stanici" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Pošta" @@ -27100,5 +27103,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Upravit poštu" @@ -27106,15 +27109,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Mateřská škola" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Upravit mateřskou školu" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Základní škola" @@ -27122,10 +27125,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Upravit školu" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Vysoká škola" @@ -27133,10 +27136,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Upravit vysokou školu" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Střední škola" @@ -27144,5 +27147,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Upravit střední školu" @@ -27150,5 +27153,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Kino" @@ -27157,10 +27160,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Upravit kino" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Knihovna" @@ -27169,9 +27172,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Upravit knihovnu" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Komunitní umělecké centrum" @@ -27179,10 +27182,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Upravit komunitní umělecké centrum" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Divadlo" @@ -27191,10 +27194,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Upravit divadlo" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Chrám(kostel, synagoga, mešita)" @@ -27204,5 +27207,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Upravit chrám" @@ -27211,6 +27214,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Náboženství" @@ -27219,66 +27222,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "bahá'í" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "budhistické" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "křesťanské" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hindské" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "džinistické" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "židovské" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "muslimské" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "spiritualistické" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoistické" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "Unitářské" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zoroastristické" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Vyznání" @@ -27287,81 +27290,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglikánské" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptistické" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "katolické" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "evangelické" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "svědkové Jehovovi" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "luteránské" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "metodistické" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormonské" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "pravoslavné" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "pentekostalistické" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "presbyteriánské" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestantské" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "kvakerské" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "ší'itské" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "sunnitské" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Adresy" @@ -27370,5 +27373,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Upravit informace o adrese" @@ -27376,5 +27379,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Číslo domu" @@ -27382,25 +27385,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Jméno domu" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Ulice" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Jméno města" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Poštovní směrovací číslo" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Kód země" @@ -27409,5 +27412,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Upravit interpolaci adres" @@ -27415,61 +27418,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Schéma číslování" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "liché" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "sudé" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "abecední" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Inženýrské objekty" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Továrna" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Upravit továrnu" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Věž" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Upravit věž" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "Typ věže" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "telekomunikační" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "pozorovací" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Výška (metrů)" @@ -27477,25 +27480,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Vodojem" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Upravit vodojem" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Plynojem" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Upravit plynojem" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Maják" @@ -27503,10 +27506,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Upravit maják" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Větrný mlýn" @@ -27514,10 +27517,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Upravit větrný mlýn" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Potrubí" @@ -27526,41 +27529,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Upravit potrubí" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "plynová" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "teplo" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "ropa" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "kanalizace" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Umístění" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "podvodní" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "nadzemní" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Čistička odpadních vod" @@ -27570,10 +27573,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Upravit čističku odpadních vod" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Jeřáb" @@ -27581,5 +27584,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Upravit jeřáb" @@ -27587,10 +27590,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Editovat vodní bój" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Triangulační bod" @@ -27598,10 +27601,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Upravit triangulační bod" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Sledovací kamera" @@ -27609,23 +27612,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Upravit sledovací kameru" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "vnitřní" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "venkovní" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Elektrárna" @@ -27635,35 +27638,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Upravit elektrárnu" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "větrná" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "vodní" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fosilní paliva" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "jaderná" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "uhelná" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "sluneční" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Rozvodna" @@ -27672,10 +27675,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Upravit rozvodnu" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Trafostanice" @@ -27684,5 +27687,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Upravit trafostanici" @@ -27690,10 +27693,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Číslo vedení" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Stožár elektrického vedení" @@ -27704,23 +27707,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Upravit stožár elektrického vedení" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "věž" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "stožár" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Dráty elektrického vedení" @@ -27729,74 +27732,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Upravit dráty elektrického vedení" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Typ vedení" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "vedení" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "vedlejší vedení" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Počet kabelů" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Počet drátů (nebo lépe vodičů) na každém kabelu" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "jednoduchý" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "dvojitý" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "trojitý" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "čtveřitý" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Občanská vybavenost" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Záchody" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Poznámka" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Poštovní schránka" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telefon" @@ -27805,5 +27808,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Upravit telefon" @@ -27811,5 +27814,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Mince" @@ -27817,5 +27820,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Bankovky" @@ -27823,5 +27826,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Elektronické peněženky nebo kreditní karty." @@ -27829,5 +27832,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Debetní karty" @@ -27835,15 +27838,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Kreditní karty" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Telefonní karty" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Recyklační stanoviště" @@ -27852,5 +27855,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Upravit recyklační stanoviště" @@ -27858,35 +27861,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Baterie" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Plechovky" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Oblečení" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Sklo" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Papír" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Kovový šrot" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "Odpadkový koš" @@ -27894,5 +27897,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Upravit odpadkový koš" @@ -27901,31 +27904,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "Opěrka zad" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Materiál" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "kámen" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "plast" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Barva" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "černá" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "hnědá" @@ -28004,5 +28007,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -28012,31 +28015,31 @@ msgstr "zeleň" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "červená" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "modrá" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "šedá" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "bílá" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Počet sedadel" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Posed" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Upravit posed" @@ -28045,30 +28048,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Výška" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "nízká" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "střední" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "plná" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Úkryt" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Uzamknutelný" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Fontána" @@ -28077,10 +28080,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Upravit fontánu" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Pitná voda" @@ -28089,10 +28092,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Upravit pitnou vodu" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Požární hydrant" @@ -28101,5 +28104,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Upravit požární hydrant" @@ -28107,5 +28110,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Babybox" @@ -28113,15 +28116,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Upravit babybox" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Obchody" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Prodejce automobilů" @@ -28129,10 +28132,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Upravit obchod s auty" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Prodejce kol" @@ -28141,28 +28144,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Upravit prodejnu kol" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Upravit supermarket" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Drogerie" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Upravit drogerii" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Samoobsluha, smíšenka, večerka" @@ -28170,9 +28173,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Upravit večerku" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Kiosek" @@ -28180,27 +28183,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Upravit kiosek" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Knihkupectví" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Upravit knihkupectví" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Cestovní kancelář" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Upravit cestovní kancelář" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Řeznictví" @@ -28208,9 +28211,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Upravit řeznictví" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Pekařství" @@ -28218,9 +28221,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Upravit pekařství" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Květinářství" @@ -28228,18 +28231,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Upravit květinářství" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Obchod se zdravou výživou" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Upravit obchod se zdravou výživou" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Alkohol" @@ -28247,54 +28250,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Upravit obchod s alkoholem" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Nápoje" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Upravit obchod s nápoji" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Počítače" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Upravit obchod s počítači" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Elektronika" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Upravit obchod s elektronikou" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Upravit obchod s hifi" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Nábytek" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Upravit obchod s nábytkem" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Zahradnické centrum" @@ -28302,9 +28305,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Upravit zahradnické centrum" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Železářství" @@ -28312,9 +28315,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Upravit železářství" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Zboží pro kutily" @@ -28322,54 +28325,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Upravit obchod se zbožím pro kutily" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Papírnictví" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Upravit papírnictví" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Kadeřnictví" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Upravit Kadeřnictví" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Obuv" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Upravit obchod s obuví" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Hračky" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Upravit obchod s hračkami" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Videopůjčovna/prodejna" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Upravit videopůjčovnu/prodejnu" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Čistírna" @@ -28377,9 +28380,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Upravit čistírnu" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Prádelna" @@ -28387,9 +28390,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Upravit prádelnu" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Vybavení do přírody" @@ -28397,24 +28400,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Obchod s vybavením do přírody" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Upravit obchod se sportovními pořebami" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Oční optik" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Upravit oční optiku" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Prodejní automat" @@ -28422,5 +28425,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Upravit prodejní automat" @@ -28428,97 +28431,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Prodávané produkty" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "lístky na městskou hromadnou dopravu" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "plány městské hromadné dopravy" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "parkovací lístky" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "jídlo" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "pití" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "sladkosti" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "cigarety" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "fotografie" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "krmivo pro zvířata" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "noviny" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "hračky" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "známky" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-karty" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "telefonní karty" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "poukazy" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "kondomy" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tampóny" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "sáčky na výkaly" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "Zůstatkové nebo věrnostní karty" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Finance" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Banka" @@ -28526,14 +28529,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Upravit banku" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Směnárna" @@ -28541,5 +28544,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Upravit směnárnu" @@ -28547,15 +28550,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Upravit bankomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Zdraví" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Zdavotní středisko, poliklinika" @@ -28563,18 +28566,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Upravit zdravotní středisko, polikliniku" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Zubař" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Upravit zubařskou ordinaci" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Lékárna" @@ -28582,5 +28585,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Upravit lékárnu" @@ -28588,9 +28591,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Vydává léky na předpis" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Nemocnice" @@ -28598,10 +28601,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Upravit nemocnici" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Místo pro kontaktování záchranářů" @@ -28610,5 +28613,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Upravit místo pro kontaktování záchranářů" @@ -28617,20 +28620,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Číslo místa" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Jméno místa" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Telefonní číslo" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Použijte mezinárodní zápis, např. +420123456789)" @@ -28638,5 +28641,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Veterinář" @@ -28645,64 +28648,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Upravit veterinární ordinaci" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Geografie" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Místa" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Upravit kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Stát" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Upravit stát" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Země" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Upravit zemi" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Kraj" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Upravit kraj" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Okres" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Upravit okres" @@ -28710,15 +28713,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Velkoměsto" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Upravit velkoměsto" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Město" @@ -28726,10 +28729,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Upravit město" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Městský obvod, nebo městská část" @@ -28737,25 +28740,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Upravit městský obvod, nebo městská část" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Obec" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Upravit obci" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Samota" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Upravit samotu" @@ -28763,5 +28766,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Místní název" @@ -28769,10 +28772,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Editovat místní název" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Ostrov" @@ -28780,10 +28783,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Upravit ostrov" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Ostrůvek" @@ -28791,5 +28794,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Upravit ostrůvek" @@ -28797,5 +28800,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Vstup do jeskyně" @@ -28803,10 +28806,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Upravit vstup do jeskyně" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Vrchol" @@ -28814,10 +28817,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Upravit vrchol" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Ledovec" @@ -28825,10 +28828,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Upravit ledovec" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Sopka" @@ -28836,70 +28839,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Upravit sopku" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Hranice" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Národní" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Upravit národní hranici" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Administrativní" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Upravit administrativní hranici" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Upravit civilní hranici" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Volební obvod" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Upravit volební obvod" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Národní park" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Upravit hranice národního parku" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Využití krajiny" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Strom" @@ -28908,15 +28911,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Upravit strom" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Botanické jméno" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Prales" @@ -28925,5 +28928,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Editovat Prales" @@ -28931,17 +28934,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "jehličnatý" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "listnatý" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "smíšený" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Les" @@ -28950,14 +28953,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Upravit lesní plochu" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Přírodní rezervace" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Upravit přírodní rezervaci" @@ -28965,25 +28968,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Suťoviště" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Upravit suťoviště" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Podrost" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Upravit podrost" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Travnatá pahorkatina" @@ -28991,10 +28994,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Upravit travnatou pahorkatinu" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Vřesoviště" @@ -29002,5 +29005,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Upravit vřesoviště" @@ -29008,5 +29011,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Farma" @@ -29015,45 +29018,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Upravit farmu" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Zemědělská půda" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Upravit zemědělskou půdu" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Louka" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Upravit louku" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Vinice" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Upravit vinici" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Zahrádkářská kolonie" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Upravit zahrádkářskou kolonii" @@ -29061,25 +29064,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Zahrada" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Upravit zahradu" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Tráva" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Upravit travnatou plochu" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Zelená plocha" @@ -29087,10 +29090,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Upravit zelenou plochu" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "veřejná zeleň (mimo parky)" @@ -29098,20 +29101,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Upravit veřejnou zeleň" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Upravit park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Rekreační plocha" @@ -29119,5 +29122,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Upravit rekreační plochu" @@ -29125,15 +29128,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Obytná plocha" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Upravit obytnou plochu" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Malý hřbitov" @@ -29141,9 +29144,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Upravit malý hřbitov" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Hřbitov" @@ -29151,39 +29154,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Upravit hřbitov" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Obchody" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Upravit plochu s obchody" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Kanceláře" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Upravit kancelářskou plochu" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Průmysl" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Upravit průmyslovou plochu" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Železniční plocha" @@ -29191,15 +29194,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Upravit železniční plochu" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Vojenský prostor" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Upravit vojenský prostor" @@ -29207,50 +29210,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Probíhající výstavba" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Upravit výstavbu" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Stará zátěž, městské ruiny (Brownfield)" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Upravit starou zátěž (Brownfield)" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Zastavitelné území (Greenfield)" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Upravit zastavitelné území (Greenfield)" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "skládka odpadu" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Upravit skládku odpadu" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Lom" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Upravit lom" @@ -29260,5 +29263,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Upravit multipolygon" @@ -29270,5 +29273,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "vnější část" @@ -29276,5 +29279,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "vnitřní část" @@ -29282,5 +29285,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "Hranice" @@ -29291,5 +29294,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "Upravit hranici" @@ -29297,36 +29300,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "Typ hranice" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "administrativní" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "národní" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "civilní" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "politická" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "Administrativní centrum" @@ -29334,5 +29337,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Zákaz odbočení" @@ -29341,5 +29344,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Upravit zákaz odbočení" @@ -29347,34 +29350,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Omezení" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "zákaz odbočení vlevo" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "zákaz odbočení vpravo" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "zákaz jízdy rovně" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "zákaz otáčení" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "pouze odbočení vpravo" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "pouze odbočení vlevo" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "pouze jízda rovně" @@ -29383,15 +29386,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "z cesty" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "přes uzel nebo cestu" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "na cestu" @@ -29399,5 +29402,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Trasa" @@ -29406,5 +29409,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Upravit trasu" @@ -29412,5 +29415,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Typ trasy" @@ -29518,5 +29521,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29527,17 +29530,17 @@ msgstr "bicykl" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "autobus" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "silnice" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "trajekt" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "lyžařská" @@ -29605,5 +29608,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29613,9 +29616,9 @@ msgstr "pěší" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "tramvajová" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "objízdná" @@ -29629,10 +29632,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Popis symbolu" @@ -29640,31 +29643,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Síť" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "navrhovaná" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "alternativní" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "dočasná" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "spojení" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Barva (hex)" @@ -29673,30 +29676,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "segment trasy" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "dopředný segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "zpětný segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "zastávka" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "dopředná zastávka" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "zpětná zastávka" @@ -29923,5 +29926,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "zastaralý" @@ -33249,11 +33252,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "místo" @@ -33267,5 +33270,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "tiger_data" @@ -33620,4 +33623,107 @@ msgid "Sicily - Italy" msgstr "Sicily - Itálie" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "Při komunikaci se serverem doslo k chybě
Detaily: {0}" + +#~ msgid "Communication with server failed" +#~ msgstr "Komunikace se serverem selhala" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Ano, obnovit je také" + +#~ msgid "No, cancel operation" +#~ msgstr "Ne, zruš operaci" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Obnovit další body?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Obnovit závislé prvky?" + +#~ msgid "Visible State:" +#~ msgstr "Stav viditelné:" + +#~ msgid "visible (on the server)" +#~ msgstr "viditelný (na serveru)" + +#~ msgid "not visible (on the server)" +#~ msgstr "neviditelný (na serveru)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Ponechat klon lokální verze" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Fyzicky odstranit z lokální datové sady" + +#~ msgid "Keep my visible state" +#~ msgstr "Ponechat můj stav viditelné" + +#~ msgid "Yes, reset the id" +#~ msgstr "Ano, resetovat id" + +#~ msgid "Reset id to 0" +#~ msgstr "Resetovat id na 0" + +#~ msgid "Keep their visible state" +#~ msgstr "Ponechat cizí stav viditelné" + +#~ msgid "Yes, purge it" +#~ msgstr "Ano, vyčistit to" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM odstraní lokální prvek s id {0}
z datové sady." +#~ "
Souhlasíte?" + +#~ msgid "Remove from dataset" +#~ msgstr "Odstranit z datové sady" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Nerozhodnutý konflikt stavu viditelné" + +#~ msgid "" +#~ "{0} conflict has been resolved automatically by purging " +#~ "{0} object
from the local dataset because it is deleted on the server." +#~ msgid_plural "" +#~ "{0} conflicts have been resolved automatically by " +#~ "purging {0} objects
from the local dataset because they are deleted " +#~ "on the server." +#~ msgstr[0] "" +#~ "{0} konflikt byl vyřešen automaticky odstraněním {0} " +#~ "objektu
z lokální datové sady protože byl vymazán na serveru." +#~ msgstr[1] "" +#~ "{0} konflikty byly vyřešeny automaticky odstraněním {0} " +#~ "objektů
z lokální datové sady protože byly vymazány na serveru." +#~ msgstr[2] "" +#~ "{0} konfliktů bylo vyřešeno automaticky odstraněním {0} " +#~ "objektů
z lokální datové sady protože byly vymazány na serveru." + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "{0} konflikt zbývá k řešení.

Prosím otevřete seznam konfliktů a " +#~ "vyřešte jej manuálně." +#~ msgstr[1] "" +#~ "{0} konflikty zbývají k řešení.

Prosím otevřete seznam konfliktů a " +#~ "vyřešte je manuálně." +#~ msgstr[2] "" +#~ "{0} konfliktů zbývá k řešení.

Prosím otevřete seznam konfliktů a " +#~ "vyřešte je manuálně." + +#~ msgid "football" +#~ msgstr "fotbal" + +#~ msgid "Football" +#~ msgstr "Fotbal" #~ msgid "Email" Index: /applications/editors/josm/i18n/po/da.po =================================================================== --- /applications/editors/josm/i18n/po/da.po (revision 22208) +++ /applications/editors/josm/i18n/po/da.po (revision 22209) @@ -9,6 +9,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-23 21:56+0000\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-28 16:18+0000\n" "Last-Translator: Esben Damgaard \n" "Language-Team: Dansk \n" @@ -17,5 +17,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:55+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:06+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -28,5 +28,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -70,5 +70,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -78,5 +78,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -244,5 +244,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -250,6 +250,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -337,8 +337,7 @@ msgstr "Ingen ønskede lag" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Tilføj punkt..." @@ -661,5 +660,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1042,5 +1041,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1049,5 +1048,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1186,4 +1185,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Flyt punkt..." @@ -1470,6 +1470,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1690,6 +1690,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2321,5 +2319,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2566,10 +2564,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Søg..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Søg efter objekter." @@ -2577,66 +2575,66 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Indtast venligst en filter tekst" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Indtast en søgetekst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Indtast søgeudtrykket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "erstat markering" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "føj til markering" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "fjern fra markering" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "Find i markering" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "versalfølsom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "alle objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "regulært udtryk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" "Baker Street - ''Baker'' og ''Street'' i enhver nøgle eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "\"Baker Street\" - ''Baker Street'' i enhver nøgle eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak - ''Bak'' hvor som helst i navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=rute - nøgle ''type'' med værdi = præcist ''rute''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2646,21 +2644,21 @@ "*=værdi, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - intet ''Bak'' i navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "fod: - key=fod sat til hvilkensomhelst værdi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Specielle mål:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2668,17 +2666,17 @@ "type: - objektets type (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - alle objekter rettet af bruger" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "bruger:anonym - alle objekter ændret af anonyme brugere" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - objekt med givet ID (0 for nye objekter)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2688,5 +2686,5 @@ "version)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2696,5 +2694,5 @@ "rettesæt)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2704,5 +2702,5 @@ "punkter:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2711,9 +2709,9 @@ "tags:... - objekt med givet antal tags (tags:tæl or tags:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2723,21 +2721,21 @@ "12T14:51:09Z, 2009-11-12 eller T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - alle ændrede objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - alle valgte objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - alle ufuldstændige objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "utagget - alle utaggede objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2745,5 +2743,5 @@ "barn udtryk - alle børn af objekter der matcher udtrykket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2752,10 +2750,10 @@ "udtrykket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "" "Brug | eller OR to for at forbinde med et logisk \"eller\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2763,5 +2761,5 @@ "b>)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2771,12 +2769,12 @@ "\\ (f.eks. \\\" og \\\\)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Brug ( og ) for at gruppere udtryk" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2785,38 +2783,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Søg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Send filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Start søgning" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Angiv et søgeudtryk" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Intet resultat for \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Intet føjet til markering ved søgning efter \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Intet fjernet fra markering ved søgning efter \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Intet fundet i markering ved søgning efter \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2824,5 +2835,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2830,5 +2841,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2836,5 +2847,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2842,5 +2853,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2973,8 +2984,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3117,5 +3128,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3244,11 +3255,11 @@ msgstr[1] "Flyt {0} punkter" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Udrensede objekt ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3257,5 +3268,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3266,5 +3277,5 @@ "er {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3302,5 +3313,5 @@ msgstr "Løs {0} tag konflikter i relation {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3638,6 +3649,6 @@ "ikke en kritisk fejl, så det skulle være sikkert at fortsætte dit arbejde." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3647,10 +3658,10 @@ msgstr "Manglende sammenlægningsmål for vej med id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Manglende sammenlægningsmål for objekt med id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3658,5 +3669,5 @@ msgstr "Manglende sammenlægningsmål for punkt med id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3665,5 +3676,5 @@ msgstr "Manglende sammenlægningsmål for relation med id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3672,78 +3683,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "Manglende sammenlægningsmål af type {0} med id {1}" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "E" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "H" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Tekst" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "R" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "A" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "D" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "F" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} objekter skjult" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3881,5 +3818,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "baggrund" @@ -4007,12 +3944,10 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (Frankrig)" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "UTM20 North Geodesic system" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4053,5 +3988,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "jernbane" @@ -4072,7 +4007,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4139,7 +4074,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "bygning" @@ -4228,5 +4163,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4454,5 +4389,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4760,12 +4695,12 @@ msgstr "Rolle {0} er ikke involveret i sammenligningspar {1}." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Egenskaber" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4776,6 +4711,6 @@ msgstr "Tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4783,6 +4718,6 @@ msgstr "Punkter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4790,9 +4725,9 @@ msgstr "Medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Ingen uafklarede tagkonflikter der skal løses" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4801,5 +4736,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4808,9 +4743,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Punkter (afklaret)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4819,17 +4754,17 @@ "punktliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Punkter (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Uafklarede konflikter i denne vejs punktliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Medlemmer (afklaret)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4839,25 +4774,25 @@ "relations medlemsliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Medlemmer (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Uafklarede konflikter i denne relations medlemsliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Ingen uafklarede egenskabskonflikter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Egenskaber (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "uafklarede egenskabskonflikter der skal løses" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Konflikt-løsning" @@ -4903,5 +4838,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Min version" @@ -4912,5 +4847,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4926,5 +4861,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Deres version" @@ -5009,5 +4944,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -5019,5 +4954,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Ned" @@ -5123,61 +5058,9 @@ "Sammenlagte punkter ikke frosset endnu. Kan ikke opbygge resolutionskommando." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" -"En fejl opstod under kommunikation med serveren
Detaljer: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Kommunikation med server fejlede" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Ja, gendan også dem" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "Nej, fortryd handlingen" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Gendan yderligere punkter?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Gendan afhængige primitiver?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Egenskaber i mit datasæt, f.eks. det lokale datasæt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5187,126 +5070,59 @@ "elementer når sammenlægningsbeslutninger er udført." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Egenskaber i deres datasæt, f.eks. server datasættet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Koordinater:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Slettet status:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Synlig status:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "ingen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "slettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "ikke slettet" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "synlig (på server)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "ikke synlig (på server)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Behold en klon af den lokale version." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Slet fysisk fra lokal datasæt" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Behold mine koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Behold deres koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "Omgør beslutning om konflikt mellem forskellige koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "Behold min slettede status" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "Behold deres slettede status" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "Omgør beslutning om konflikt mellem slettede status" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "Behold min slettede status" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Ja, nulstil ID" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "Nulstil ID til 0" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Behold deres synlige status" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Ja, udrens det" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM vil være nødt til at fjerne din lokale primitiv med ID {0}
fra " -"datasættet.
Indvilliger du?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Fjern fra datasæt" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "Omgør beslutning om konflikt mellem synlige status" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5454,5 +5270,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "alle" @@ -5533,7 +5349,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5543,6 +5359,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5751,5 +5567,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5809,25 +5625,25 @@ "ovenfor." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Abryd konfliktløsning og luk dialogen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Anvend løste konflikter og luk dialogen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Anvend løsning" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Luk alligevel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Fortsæt løsning" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5839,22 +5655,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "Konflikt er ikke helt løst" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Løs konflikter for ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Filtrér objekter og skjul/slå dem fra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5867,43 +5683,122 @@ msgstr "Tilføj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "tilføj filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Redigér filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Slet filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Flyt filter op." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Flyt filter ned." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Slå filter til" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Skjul elementer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Omvend filter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Filtertilstand" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Fejl ved indlæsning af fil" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "E" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "H" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Tekst" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "R" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "A" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "D" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} objekter skjult" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5946,37 +5841,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Indtast koordinater for det nye punkt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Brug decimalgrader" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative værdier angiver vestlig/sydlig halvkugle." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Indtast venligst en gyldig breddegrad i området -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Indtast venligst en breddegrad i området -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Indtast venligst en gyldig længdegrad i området -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Indtast venligst en længdegrad i området -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Luk dialogen og opret et nyt punkt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Luk dialogen uden at oprette et nyt punkt" @@ -6036,5 +5931,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relationer" @@ -6083,10 +5978,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -6150,14 +6045,14 @@ msgstr "Valgt: Rel.:{0} / Veje:{1} / Punkter:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Markering: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6869,8 +6764,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6895,6 +6798,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7277,69 +7178,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Navn" @@ -7947,5 +7849,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8621,8 +8523,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Type" @@ -8651,6 +8553,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "ukendt" @@ -8989,5 +8891,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Konflikter opdaget" @@ -9540,4 +9442,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -10076,5 +9979,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Beskrivelse" @@ -10125,5 +10028,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10203,23 +10106,23 @@ "estimere deres tid blev udeladt." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Datalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "Uden for det downloadede område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 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" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10228,42 +10131,11 @@ msgstr[1] "Der blev opdaget {0} konflikter" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -"{0} konflikt er blevet løst automatisk ved udrensning af " -"{0} objekt
fra det lokale datasæt fordi det er slettet på serveren." -msgstr[1] "" -"{0} konflikter er blevet løst automatisk ved udrensning af " -"{0} objekter
fra det lokale datasæt fordi de er slettet på serveren." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"{0} konflikt mangler endnu at blive løst.

Åbn venligst " -"konfliktlistedialogen og løs den manuelt." -msgstr[1] "" -"{0} konflikter mangler endnu at blive løst.

Åbn venligst " -"konfliktlistedialogen og løs dem manuelt." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "Klik for at lukke denne dialog og fortsætte med at redigere" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10272,32 +10144,32 @@ msgstr[1] "{0} slettet" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} består af:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "nulstil" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "API-version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Konvertér til GPX-lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "Datasætskonsistenstest" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "Fandt ingen problemer" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "Følgende problemer blev fundet:" @@ -13347,4 +13219,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14856,5 +14729,5 @@ "

Fejlmeddelelsen er:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15132,5 +15005,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Adresse-interpolering" @@ -15565,36 +15438,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Multipolygon" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "adresse" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Opret en ny relation" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Bygninger" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Nummer" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Næste" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Adresser" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15750,10 +15624,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "Slå billedbeskæring fra under geo-referencering." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15808,7 +15686,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15817,13 +15695,13 @@ msgstr "vand" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15871,32 +15749,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "adresse" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Slå automatisk caching til." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Maks. cachestørrelse (i MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15908,18 +15786,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "Fransk Cadastre-WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Kilde" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15929,5 +15807,5 @@ "defineret i JOSM-indstillingerne." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15937,131 +15815,135 @@ "Nyttigt for tekster på sorte baggrunde." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Tegn et rektangel omkring downloadet data fra WMS-server." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Hent mindre billeder (højere kvalitet men kræver mere hukommelse)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fast størrelse (fra 25 til 1.000 meter)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Ældste filer bliver automatisk slettet, når denne størrelse overskrides." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16368,5 +16250,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -16375,14 +16257,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Mellemlager format fejl" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "Mellemlager Lambert Zone fejl" @@ -17655,4 +17537,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17693,9 +17594,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -19205,5 +19101,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Andet" @@ -19395,5 +19291,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Multipolygon" @@ -19925,5 +19821,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "område" @@ -19967,34 +19863,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Intet data" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -20019,7 +19918,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Utaggede veje" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20959,7 +20857,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Vælg venligst en fil" +msgstr "" #. Strings in JFileChooser @@ -21265,7 +21162,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21276,10 +21180,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Tilføjer ruteplan-egenskaber" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21288,5 +21192,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21297,15 +21201,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Tillad tilføjelse af markører/punkter på de nuværende gps-positioner." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Stiller en dialog til redigering af tags i tabelform til rådighed" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21318,10 +21222,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "Laver rækkehuse ud af en enkelt blok." #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21330,5 +21234,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21337,5 +21241,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21344,10 +21248,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21358,5 +21262,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21366,5 +21270,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21375,15 +21279,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "Nem download langs et langt sæt af indbyrdes forbundne veje" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21392,5 +21296,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21523,5 +21427,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Reference" @@ -22060,5 +21964,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "metal" @@ -22071,5 +21975,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "træ" @@ -22374,8 +22278,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "ja" @@ -22486,8 +22390,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "nej" @@ -22793,5 +22697,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "service" @@ -22911,5 +22815,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "vandring" @@ -23058,4 +22962,9 @@ msgid "Edit Motorway Junction" msgstr "Ret motorvejskryds" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Nummer" #. item "Waypoints/Motorway Junction" text "Number" @@ -23108,13 +23017,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Selskab" @@ -23382,6 +23291,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Højde" @@ -24233,5 +24142,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Spænding" @@ -24602,24 +24511,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Åbningstider" @@ -24686,23 +24595,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24/7" @@ -24716,23 +24625,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "Mandag-Fredag 08:30-20:00" @@ -24746,23 +24655,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -24876,6 +24785,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Referensenummer" @@ -24891,5 +24800,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "underjordisk" @@ -24903,5 +24812,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Gebyr" @@ -25077,5 +24986,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "kørestol" @@ -25113,5 +25022,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Læskur" @@ -25119,5 +25028,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Bænk" @@ -25236,5 +25145,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Pejlemærke" @@ -25973,5 +25882,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Sport" @@ -26046,5 +25955,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -26158,12 +26115,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26230,12 +26179,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26249,12 +26190,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -26416,5 +26349,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "sport" @@ -26441,4 +26375,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "australsk fodbold" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "australsk fodbold" @@ -26466,4 +26406,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "australsk fodbold" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "kano" @@ -26506,6 +26452,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "amerikansk fodbold" +#, fuzzy +msgid "gaelic_football" +msgstr "australsk fodbold" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26546,5 +26493,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "rugby" @@ -26665,6 +26618,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26678,5 +26635,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26698,4 +26654,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "type" @@ -26719,6 +26677,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26731,5 +26693,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26751,4 +26712,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "bane" @@ -26771,4 +26734,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "sportshal" @@ -26791,4 +26756,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "stadion" @@ -26811,4 +26778,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "spor" @@ -27010,158 +26979,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Amerikansk fodbold" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Ret amerikansk fodbold" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Australsk fodbold" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Ret australsk fodbold" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Australsk fodbold" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Ret australsk fodbold" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Ret amerikansk fodbold" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Ret australsk fodbold" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Ret amerikansk fodbold" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Ret amerikansk fodbold" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Ret rugby" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Ret rugby" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Ret Baseball" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Ret Basketball" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Ret Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "Golfbane" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Petanque" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Ret petanque" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Ret cricket" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Cricketnet" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Ret cricketnet" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Kroket" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Ret kroket" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Ret hockey" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Ret pelota" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Ret rugby" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Bordtennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Ret bordtennis" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Ret tennis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Menneskeskabt" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Bygning" @@ -27169,5 +27174,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Offentlig bygning" @@ -27175,10 +27180,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Ret offentlig bygning" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Rådhus" @@ -27186,10 +27191,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Ret rådhus" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Ambassade" @@ -27197,10 +27202,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Ret ambassade" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Domhus" @@ -27209,10 +27214,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Ret domhus" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Fængsel" @@ -27221,10 +27226,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Ret fængsel" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Politi" @@ -27234,10 +27239,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Ret politi" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Brandstation" @@ -27246,10 +27251,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Ret brandstation" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Posthus" @@ -27257,5 +27262,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Ret posthus" @@ -27263,15 +27268,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Børnehave" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Ret børnehave" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Skole" @@ -27279,10 +27284,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Ret skole" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Universitet" @@ -27290,10 +27295,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Ret universitet" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Videregående udd." @@ -27301,5 +27306,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Ret videregående udd." @@ -27307,5 +27312,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Biograf" @@ -27314,10 +27319,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Ret biograf" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Bibliotek" @@ -27326,9 +27331,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Ret bibliotek" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Kunstcenter" @@ -27336,10 +27341,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Ret kunstcenter" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Teater" @@ -27348,10 +27353,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Ret teater" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Sted for tilbedelse" @@ -27361,5 +27366,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Ret sted for tilbedelse" @@ -27368,6 +27373,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Religion" @@ -27376,66 +27381,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "buddhistisk" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "kristen" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hinduistisk" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "jainistisk" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "jødisk" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "muslimsk" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "spiritistisk" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoistisk" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "unitar" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zoroastristisk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Trosretning" @@ -27444,81 +27449,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglikansk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptistisk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "katolsk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "evangelisk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "Jehovas Vidner" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "luthersk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "metodistisk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormonsk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "ortodoks" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "pinsebevægelsen" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "prebyteriansk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestantisk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "kvæker" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "shiitisk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "sunnitisk" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Adresser" @@ -27527,5 +27532,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Ret adresseinformation" @@ -27533,5 +27538,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Husnummer" @@ -27539,25 +27544,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Husnavn" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Vejnavn" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Bynavn" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Postnummer" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Landekode" @@ -27566,5 +27571,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Ret adresse-interpolering" @@ -27572,61 +27577,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Nummereringssystem" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "ulige" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "lige" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "alfabetisk" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Menneskeskabt" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Fabrik" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Ret fabrik" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Tårn" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Ret tårn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "Type af tårn" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "kommunikation" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "observation" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Højde (meter)" @@ -27634,25 +27639,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Vandtårn" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Ret vandtårn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Gasbeholder" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Ret gasbeholder" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Fyrtårn" @@ -27660,10 +27665,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Ret fyrtårn" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Vejrmølle" @@ -27671,10 +27676,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Ret vejrmølle" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Rørledning" @@ -27683,41 +27688,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Ret rørledning" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "gas" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "varme" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "olie" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "Spildevand" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Sted" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "undervands" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "på land" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Rensningsanlæg" @@ -27727,10 +27732,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Ret rensningsanlæg" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Kran" @@ -27738,5 +27743,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Ret kran" @@ -27744,10 +27749,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Ret Pejlemærke" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Målepunkt" @@ -27755,10 +27760,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Ret målepunkt" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Overvågning" @@ -27766,23 +27771,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Ret overvågningskamera" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Generator" @@ -27792,35 +27797,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Ret generator" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "vind" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "vand" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "arom" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "kul" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "sol" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Kraftværk" @@ -27829,10 +27834,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Ret kraftværk" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Transformatorstation" @@ -27841,5 +27846,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Ret transformatorstation" @@ -27847,10 +27852,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Linie reference" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Elmast" @@ -27861,23 +27866,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Ret elmast" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "tårn" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "stang" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "Tårn reference" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Strømkabel" @@ -27886,74 +27891,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Ret strømkabel" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Linie type" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "linie" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Antal kabler" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "enkelt" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "dobbelt" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "tredobbelt" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "firdobbelt" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Faciliteter" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Toiletter" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Note" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Postkasse" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telefon" @@ -27962,5 +27967,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Ret telefon" @@ -27968,5 +27973,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Mønter" @@ -27974,5 +27979,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Sedler" @@ -27980,5 +27985,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Elektroniske punge og betalingskort" @@ -27986,5 +27991,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Kreditkort" @@ -27992,15 +27997,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Kreditkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Telefonkort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Genbrug" @@ -28009,5 +28014,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Ret genbrugsplads" @@ -28015,35 +28020,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Batterier" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Dåser" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Tøj" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Papir" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Skrotjern" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "" @@ -28051,5 +28056,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "" @@ -28058,31 +28063,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Materiale" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "sten" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "plastik" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Farve" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "sort" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "brun" @@ -28161,5 +28166,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -28169,31 +28174,31 @@ msgstr "grøn" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "rød" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "blå" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "grå" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "hvid" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Antal sæder" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Skydetelt" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Ret skydetelt" @@ -28202,30 +28207,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Højde" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "lav" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "halv" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "fuld" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Skjul" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Lås" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Springvand" @@ -28234,10 +28239,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Ret springvand" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Vandpost" @@ -28246,10 +28251,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Ret vandpost" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "" @@ -28258,5 +28263,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "" @@ -28264,5 +28269,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Babyluge" @@ -28270,15 +28275,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Ret babyluge" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Butikker" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Bilforhandler" @@ -28286,10 +28291,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Ret bilforhandler" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Cykelhandler" @@ -28298,28 +28303,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Ret cykelhandler" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermarked" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Ret supermarked" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Købmand" @@ -28327,9 +28332,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Ret købmand" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Kiosk" @@ -28337,27 +28342,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Ret kiosk" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Boghandler" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Ret boghandler" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Rejsebureau" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Ret rejsebureau" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Slagter" @@ -28365,9 +28370,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Ret slagter" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Bager" @@ -28375,9 +28380,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Ret bager" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Blomsterhandler" @@ -28385,18 +28390,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Ret blomsterhandler" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Økologisk" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Ret økologisk forretning" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Sprit" @@ -28404,54 +28409,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Ret spritbutik" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Drikkevarer" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Ret drikkevarebutik" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Computer" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Ret computerforretning" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Elektronik" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Ret elektronikforretning" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hi-fi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Ret hi-fi-forhandler" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Møbelforretning" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Ret møbelforretning" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Havecenter" @@ -28459,9 +28464,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Ret havecenter" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Isenkræmmer" @@ -28469,9 +28474,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Ret isenkræmmer" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Gør-det-selv-butik" @@ -28479,54 +28484,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Ret gør-det-selv-butik" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Frisør" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Ret frisør" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Sko" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Ret skobutik" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Legetøjsbutik" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Ret legetøjsbutik" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Video" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Ret videobutik" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Kemisk renseri" @@ -28534,9 +28539,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Ret kemisk renseri" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Vaskeri" @@ -28544,9 +28549,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Ret vaskeri" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "" @@ -28554,24 +28559,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Ret sportsbutik" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Optiker" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Ret optiker" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Automat" @@ -28579,5 +28584,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Ret automat" @@ -28585,97 +28590,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Varer i automat" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "P-automat" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "mad" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "drikke" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "slik" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "cigaretter" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "billeder" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "dyremad" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "aviser" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "legetøj" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "frimærker" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "telefonkort" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "kondomer" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tamponer" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "høm-høm-pose" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Penge" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Bank" @@ -28683,14 +28688,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Ret bank" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Pengeautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Vekselkontor" @@ -28698,5 +28703,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Ret vekselkontor" @@ -28704,15 +28709,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Ret pengeautomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Sundhed" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Lægehus" @@ -28720,18 +28725,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Ret lægehus" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Tandlæge" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Ret tandlæge" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Apotek" @@ -28739,5 +28744,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Ret apotek" @@ -28745,9 +28750,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Håndkøb" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Hospital" @@ -28755,10 +28760,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Ret Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "" @@ -28767,5 +28772,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "" @@ -28774,20 +28779,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Telefonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(brug forvalgskode, fx +12-345-67890)" @@ -28795,5 +28800,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Dyrlæge" @@ -28802,64 +28807,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Ret dyrlæge" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Geografi" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Steder" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Ret et kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Land" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Ret land" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Stat" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Ret stat" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Ret region" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Amt" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Ret amt" @@ -28867,15 +28872,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Storby" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Ret storby" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "By" @@ -28883,10 +28888,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Ret By" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Forstad" @@ -28894,25 +28899,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Ret forstad" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Mindre by" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Ret mindre by" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Landsby" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Ret landsby" @@ -28920,5 +28925,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Egn" @@ -28926,10 +28931,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Ret lokalitet" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Ø" @@ -28937,10 +28942,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Ret ø" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "" @@ -28948,5 +28953,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "" @@ -28954,5 +28959,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Huleindgang" @@ -28960,10 +28965,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Ret huleindgang" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Tinde" @@ -28971,10 +28976,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Ret tinde" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Gletsjer" @@ -28982,10 +28987,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Ret gletsjer" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Vulkan" @@ -28993,70 +28998,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Ret vulkan" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Grænser" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "National" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Ret landegrænser" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Administrativt" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Ret administrativ grænse" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Civil" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Ret civil-grænse" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Politisk" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Ret politisk grænse" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Nationalpark" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Ret grænser for nationalpark" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Brug af land" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Træ" @@ -29065,15 +29070,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Ret et træ" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Botanisk navn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Naturskov" @@ -29082,5 +29087,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Ret naturskov" @@ -29088,17 +29093,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "Nåleskov" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "Løvskov" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "blandet" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Skov" @@ -29107,14 +29112,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Ret skovområde" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Naturreservat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Ret naturreservat" @@ -29122,25 +29127,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Ur" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Ret ur" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Krat" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Ret krat" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Fjeldområde" @@ -29148,10 +29153,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Ret fjeldområde" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Hede" @@ -29159,5 +29164,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Ret hede" @@ -29165,5 +29170,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Gårdsplads" @@ -29172,45 +29177,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Ret gårdsplads" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Jordbrugsland" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Ret landbrugsland" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Eng" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Vingård" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Ret vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Kolonihaver" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Ret kolonihave-område" @@ -29218,25 +29223,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Have" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Ret have" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Græs" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "" @@ -29244,10 +29249,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "" @@ -29255,20 +29260,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Ret park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Rekreativt område" @@ -29276,5 +29281,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Ret rekreativt område" @@ -29282,15 +29287,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Beboelseområde" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Gravplads" @@ -29298,9 +29303,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Ret gravplads" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Kirkegård" @@ -29308,39 +29313,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Ret kirkegård" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Detailhandel" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Ret område for detailhandel" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Industri" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Ret industri-område" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "" @@ -29348,15 +29353,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Militært område" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Ret militært område" @@ -29364,50 +29369,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Byggeplads" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Ret område for byggeplads" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Losseplads" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Ret losseplads" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Stenbrud" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Ret stenbrudsområde" @@ -29417,5 +29422,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Ret multipolygon" @@ -29427,5 +29432,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "ydre segment" @@ -29433,5 +29438,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "indre segment" @@ -29439,5 +29444,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -29448,5 +29453,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -29454,36 +29459,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -29491,5 +29496,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "" @@ -29498,5 +29503,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "" @@ -29504,34 +29509,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "ingen_venstre_sving" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "ingen_højre_sving" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "ingen_lige_ud" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "ingen_u_vendinger" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "kun_højre_sving" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "kun_venstre_sving" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "kun_lige_ud" @@ -29540,15 +29545,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "fra vej" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "til vej" @@ -29556,5 +29561,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Rute" @@ -29563,5 +29568,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Ret rute" @@ -29569,5 +29574,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Rutetype" @@ -29675,5 +29680,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29684,17 +29689,17 @@ msgstr "cykel" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "vej" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "færge" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "ski" @@ -29762,5 +29767,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29770,9 +29775,9 @@ msgstr "fod" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "sporvogn" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "omvej" @@ -29786,10 +29791,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "undergrundsbane" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Symbol beskrivelse" @@ -29797,31 +29802,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Netværk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "foreslået" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "skiftende" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "midlertidig" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "forbindelse" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Farve (hex)" @@ -29830,30 +29835,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "rute-segment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "" @@ -30080,5 +30085,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "" @@ -33406,11 +33411,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "sted" @@ -33424,5 +33429,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" @@ -33777,4 +33782,102 @@ msgid "Sicily - Italy" msgstr "Sicilen - Italien" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "En fejl opstod under kommunikation med serveren
Detaljer: {0}" + +#~ msgid "Communication with server failed" +#~ msgstr "Kommunikation med server fejlede" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Ja, gendan også dem" + +#~ msgid "No, cancel operation" +#~ msgstr "Nej, fortryd handlingen" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Gendan yderligere punkter?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Gendan afhængige primitiver?" + +#~ msgid "Visible State:" +#~ msgstr "Synlig status:" + +#~ msgid "visible (on the server)" +#~ msgstr "synlig (på server)" + +#~ msgid "not visible (on the server)" +#~ msgstr "ikke synlig (på server)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Behold en klon af den lokale version." + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Slet fysisk fra lokal datasæt" + +#~ msgid "Keep my visible state" +#~ msgstr "Behold min slettede status" + +#~ msgid "Yes, reset the id" +#~ msgstr "Ja, nulstil ID" + +#~ msgid "Reset id to 0" +#~ msgstr "Nulstil ID til 0" + +#~ msgid "Keep their visible state" +#~ msgstr "Behold deres synlige status" + +#~ msgid "Yes, purge it" +#~ msgstr "Ja, udrens det" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM vil være nødt til at fjerne din lokale primitiv med ID {0}" +#~ "
fra datasættet.
Indvilliger du?" + +#~ msgid "Remove from dataset" +#~ msgstr "Fjern fra datasæt" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Omgør beslutning om konflikt mellem synlige status" + +#~ msgid "" +#~ "{0} conflict has been resolved automatically by purging " +#~ "{0} object
from the local dataset because it is deleted on the server." +#~ msgid_plural "" +#~ "{0} conflicts have been resolved automatically by " +#~ "purging {0} objects
from the local dataset because they are deleted " +#~ "on the server." +#~ msgstr[0] "" +#~ "{0} konflikt er blevet løst automatisk ved udrensning af " +#~ "{0} objekt
fra det lokale datasæt fordi det er slettet på serveren." +#~ msgstr[1] "" +#~ "{0} konflikter er blevet løst automatisk ved udrensning " +#~ "af {0} objekter
fra det lokale datasæt fordi de er slettet på serveren." + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "{0} konflikt mangler endnu at blive løst.

Åbn venligst " +#~ "konfliktlistedialogen og løs den manuelt." +#~ msgstr[1] "" +#~ "{0} konflikter mangler endnu at blive løst.

Åbn venligst " +#~ "konfliktlistedialogen og løs dem manuelt." + +#~ msgid "football" +#~ msgstr "amerikansk fodbold" + +#~ msgid "Football" +#~ msgstr "Amerikansk fodbold" #~ msgid "Move" Index: /applications/editors/josm/i18n/po/de.po =================================================================== --- /applications/editors/josm/i18n/po/de.po (revision 22208) +++ /applications/editors/josm/i18n/po/de.po (revision 22209) @@ -8,6 +8,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-28 14:43+0000\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-30 13:28+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:50+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:08+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -244,5 +244,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -250,6 +250,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -339,8 +339,7 @@ msgstr "Keine Zielebenen" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Knoten hinzufügen..." @@ -664,5 +663,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1047,5 +1046,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1054,5 +1053,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1191,4 +1190,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Knoten verschieben..." @@ -1483,6 +1483,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1704,6 +1704,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2360,5 +2358,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2608,10 +2606,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Suchen..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Nach Objekten suchen." @@ -2619,49 +2617,49 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Bitte einen Filterbegriff eingeben." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Bitte einen Suchbegriff eingeben." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Geben Sie einen Suchausdruck ein" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "Auswahl ersetzen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "zur Auswahl hinzufügen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "aus der Auswahl entfernen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "in der Auswahl suchen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "Groß-/Kleinschreibung beachten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "Alle Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "Auch unvollständige und gelöschte Objekte in Suche einschließen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "Regulärer Ausdruck" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" @@ -2669,5 +2667,5 @@ "Namen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" @@ -2675,13 +2673,13 @@ "Namen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Ber - ''Ber'' irgendwo im Namen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - Schlüssel ''type'' mit exakt dem Wert ''route''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2691,21 +2689,21 @@ "type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Ber - kein ''Ber'' im Namen." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "oneway? - oneway=yes, ''true'', ''1'' oder ''on''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - Schlüssel=foot mit beliebigem Wert." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Spezialsuchen:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2713,9 +2711,9 @@ "type: - Typ des Objektes (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - Alle von diesem Nutzer geänderten Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" @@ -2723,9 +2721,9 @@ "wurden" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - Objekte mit der angegebenen ID (0 für neue Objekte)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2735,5 +2733,5 @@ "Version)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2743,5 +2741,5 @@ "für Objekte ohne Änderungssatz)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2751,5 +2749,5 @@ "oder nodes:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2759,9 +2757,9 @@ "oder tags: min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "role:... - Objekt mit gegebener Rolle in einer Relation" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2771,21 +2769,21 @@ "12T14:51:09Z, 2009-11-12 oder T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - Alle geänderten Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - Alle ausgewählten Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - Alle unvollständigen Objekte" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - Alle Objekte ohne Merkmale" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2794,5 +2792,5 @@ "Ausdrucks" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2801,10 +2799,10 @@ "Ausdrucks" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "" "Nutzung von | oder OR zum Kombinieren mittels logischem Oder." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2812,5 +2810,5 @@ "enthält)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2821,12 +2819,12 @@ "\\\\)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Nutzung von ( und ) zum Gruppieren von Ausdrücken." #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2835,33 +2833,46 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Suche" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Filter bestätigen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Suche starten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Suchbegriff eingeben" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Nichts gefunden für Suche ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nichts zur Auswahl hinzugefügt durch Suche nach ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nichts aus der Auswahl entfernt durch Suche ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" @@ -2869,5 +2880,5 @@ "Bei der Suche nach \"{0}\" konnte in der Auswahl nichts gefunden werden." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2875,5 +2886,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2881,5 +2892,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2887,5 +2898,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2893,5 +2904,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -3029,8 +3040,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3173,5 +3184,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3305,11 +3316,11 @@ msgstr[1] "{0} Knoten bewegen" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Das Objekt ''{0}'' wurde entfernt" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3318,5 +3329,5 @@ msgstr[1] "{0} Objekte wurden entfernt" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3327,5 +3338,5 @@ "aber min. 2 Knoten benötigt." -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3363,5 +3374,5 @@ msgstr "{0} Merkmalskonflikte in Relation {1} auflösen" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3707,6 +3718,6 @@ "JOSM fortsetzen können." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3717,5 +3728,5 @@ "Beim Zusammenführen wurde der Ziel-Weg für den Weg mit ID {0} nicht gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" @@ -3724,5 +3735,5 @@ "gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3732,5 +3743,5 @@ "gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3741,5 +3752,5 @@ "nicht gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3750,78 +3761,4 @@ "Beim Zusammenführen wurde das Ziel-Objekt vom Type {0} für das Objekt mit ID " "{1} nicht gefunden" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "A" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "S" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Text" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "E" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "H" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "L" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "F" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

Filter aktiv

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} Objekte versteckt" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "{0} Objekte ausgeblendet" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "

Den Filterdialog schließen, um alle Objekte zu sehen

" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3962,5 +3899,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "Hintergrund" @@ -4085,15 +4022,13 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29 msgid "Guyane RGFG95" -msgstr "" +msgstr "Guyane RGFG95" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (Frankreich)" +msgstr "UTM-Frankreich (DOM)" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "UTM20-Nord Geodätisches System" +msgstr "Geodätisches System UTM" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4136,5 +4071,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "Eisenbahn" @@ -4155,7 +4090,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4222,7 +4157,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "Gebäude" @@ -4311,5 +4246,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4544,5 +4479,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4861,12 +4796,12 @@ msgstr "Role {0} nimmt nicht an dem Vergleichspaar {1} teil." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Eigenschaften" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4877,6 +4812,6 @@ msgstr "Merkmale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4884,6 +4819,6 @@ msgstr "Knoten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4891,9 +4826,9 @@ msgstr "Elemente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Keine verbleibenden Merkmalskonflikte zu beheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4902,5 +4837,5 @@ msgstr[1] "Merkmale ({0} Konflikte)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4909,9 +4844,9 @@ msgstr[1] "{0} verbleibende Merkmalskonflikte zu beheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Knoten(gelöst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4920,17 +4855,17 @@ "Knotenliste des Weges." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Knoten(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Verbleibende Konflikte in der Knotenliste des Weges" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Elemente(gelöst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4940,25 +4875,25 @@ "Elementenliste der Relation." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Elemente(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Verbleibende Konflikte in der Elementenliste der Relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Keine verbleibenden Eigenschaftskonflikte" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Eigenschaften(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Verbleibende Eigenschaftskonflikte zu beheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Konfliktlösung" @@ -5006,5 +4941,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Meine Version" @@ -5015,5 +4950,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -5029,5 +4964,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Deren Version" @@ -5109,5 +5044,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -5119,5 +5054,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Runter" @@ -5222,72 +5157,9 @@ "ausgeführt werden." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" -"Fehler bei der Kommunikation mit dem Server
Details: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Fehler bei der Kommunikation mit dem Server" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Ja, auch wiederherstellen" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "Nein, Operation abbrechen" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -"Es gibt {0} zusätzlichen Knoten vom Weg {1},
der auf dem Server " -"gelöscht ist.

Soll dieser Knoten auch wiederhergestellt werden?" -msgstr[1] "" -"Es gibt {0} zusätzliche Knoten vom Weg {1},
die auf dem Server " -"gelöscht sind.

Sollen diese Knoten auch wiederhergestellt werden?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Zusätzliche Knoten wiederherstellen?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -"Es gibt {0} zusätzliches Objekt, das von Relation {1} referenziert " -"wird
und das auf dem Server gelöscht ist.

Soll dieses Objekt auch " -"wiederhergestellt werden?" -msgstr[1] "" -"Es gibt {0} zusätzliche Objekte, die von Relation {1} referenziert " -"werden
und die auf dem Server gelöscht sind.

Sollen diese Objekte " -"auch wiederhergestellt werden?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Abhängige Objekte wiederherstellen?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Eigenschaften in meinem Datensatz (lokaler Datensatz)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5297,129 +5169,59 @@ "eigenen Elements ersetzen, wenn die Vereinigung angewendet wird." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Eigenschaften in deren Datensatz (Serverdatensatz)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Koordinaten:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Löschstatus:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Löschstatus:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "Referenziert durch:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(nichts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "gelöscht" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "nicht gelöscht" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "sichtbar (auf Server)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "nicht sichtbar (auf dem Server)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Exakte Kopie der lokalen Version behalten" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Aus dem lokalen Datensatz löschen" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Behalte meine Koordinaten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Server-Koordinaten behalten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "Nicht aufgelöster Konflikt durch unterschiedliche Koordinaten." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "Löschstatus der lokalen Daten behalten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "Löschstatus der Server-Daten behalten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "Nicht aufgelöster Konflikt durch unterschiedlichen Löschstatus." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "Übernehme meinen Löschstatus" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Ja, diese ID zurücksetzten" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" -"Um Ihre lokale Version zu behalten, muss JOSM
die ID des Objekts " -"{0} auf 0 setzen.
Beim nächsten Hochladen wird der Server eine
neue ID " -"zuweisen.
Stimmen Sie zu?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "ID auf 0 zurücksetzen" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Übernehme deren Löschstatus" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Ja, entfernen" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM wird das Objekt {0} im lokalen Datensatz löschen.
Sind Sie " -"damit einverstanden?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Aus dem Datensatz löschen" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "Löschstatus ist unterschiedlich." #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5568,5 +5370,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "alle" @@ -5647,7 +5449,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5657,6 +5459,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5872,5 +5674,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5929,25 +5731,25 @@ "Objekte setzen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Konfliktauflösung abbrechen und Fenster schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Gelöste Konflikte anwenden und Fenster schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Lösung anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Trotzdem schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Weiter auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5965,22 +5767,22 @@ "fortzufahren." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "Konflikt konnte nicht vollständig gelöst werden." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Konflikte auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Konflikte lösen für ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Objekte filtern und verbergen/deaktivieren." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5993,44 +5795,123 @@ msgstr "Hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "Filter hinzufügen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Filter bearbeiten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Filter löschen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Filter nach oben verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Filter nach unten verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Filter aktivieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Elemente verbergen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Filter invertieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Filtermodus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "Filter: Versteckt:{0} Aus:{1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Fehler beim Laden der Datei" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "A" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "S" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Text" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "E" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "H" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "L" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

Filter aktiv

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} Objekte versteckt" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "{0} Objekte ausgeblendet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "

Den Filterdialog schließen, um alle Objekte zu sehen

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -6072,37 +5953,37 @@ msgstr "Erweiterte Objektinformationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Koordinaten des neuen Knotens eingeben." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Verwenden Sie Angaben in Dezimalgrad." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative Werte für die westliche oder südliche Hemisphere." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Bitte eine gültige Breite im Bereich -90..90 eingeben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Bitte eine Breite im Bereich -90..90 eingeben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Bitte eine gültige Länge im Bereich -180..180 eingeben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Bitte eine Länge im Bereich -180..180 eingeben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Dialog schließen und neuen Knoten anlegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Dialog schließen, keinen neuen Knoten anlegen" @@ -6162,5 +6043,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relationen" @@ -6210,10 +6091,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "Unvollständige Elemente der ausgewählten Relationen herunterladen" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "Unvollständige Elemente herunterladen" @@ -6277,14 +6158,14 @@ msgstr "Ausw.: Rel.:{0}/Wege:{1}/Knoten:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Auswahl: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "Detaillierte Informationen über internen Objektstatus erhalten." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "Inspizieren" @@ -7003,8 +6884,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -7029,6 +6918,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7411,69 +7298,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Name" @@ -8100,5 +7988,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8786,8 +8674,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Typ" @@ -8816,6 +8704,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "unbekannt" @@ -9177,5 +9065,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Konflikte gefunden" @@ -9761,4 +9649,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -10317,5 +10206,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Beschreibung" @@ -10366,5 +10255,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10445,24 +10334,24 @@ "der GPS-Spur entfernt waren, wurden ignoriert." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Datenebene {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "Außerhalb des heruntergeladenen Bereichs" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "Version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 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" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10471,44 +10360,11 @@ msgstr[1] "{0} Konflikte wurden entdeckt." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -"{0} Konflikt wurde automatisch aufgelöst indem {0} " -"Objekt
aus dem lokalen Datensatz entfernt wurde, weil es bereits auf dem " -"Server gelöscht wurde." -msgstr[1] "" -"{0} Konflikte wurden automatisch aufgelöst indem {0} " -"Objekte
aus dem lokalen Datensatz entfernt wurden, weil sie bereits auf " -"dem Server gelöscht wurden." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"{0} Konflikt muss noch gelöst werden.

Bitte öffnen Sie den Konflikt-" -"Dialog und lösen Sie ihn manuell." -msgstr[1] "" -"{0} Konflikte müssen noch gelöst werden.

Bitte öffnen Sie den " -"Konflikt-Dialog und lösen Sie sie manuell." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "Diesen Dialog schließen und Bearbeitung fortsetzen" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10517,32 +10373,32 @@ msgstr[1] "{0} gelöscht" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} besteht aus:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "nicht angegeben" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "API-Version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Zu GPX-Ebene konvertieren" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "Datensatzkonsistenzprüfung" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "Keine Probleme gefunden" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "Folgende Probleme gefunden:" @@ -13773,4 +13629,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -15421,5 +15278,5 @@ "

Die Fehlermeldung lautet:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15720,5 +15577,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Adressinterpolation" @@ -16175,5 +16032,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19 msgid "Big buildings mode" -msgstr "" +msgstr "Modeus Große Gebäude" #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20 @@ -16232,9 +16089,9 @@ #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379 msgid "Point on the corner of the building to start drawing" -msgstr "" +msgstr "Auf Gebäudeecke zeigen, um Zeichnen zu beginnen" #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381 msgid "Point on opposite end of the building" -msgstr "" +msgstr "Auf gegenüberliegende Gebäudeecke zeigen" #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383 @@ -16242,36 +16099,37 @@ msgstr "Gebäudebreite setzen" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Multipolygon" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "Adresse" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Eine neue Relation erstellen" +msgstr "Adresse hinzufügen" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Gebäude" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Nummer" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Nächstes" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Straße" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Adressen" +msgstr "Adressen eingeben" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -16442,11 +16300,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "Bildbeschneidung während der Georeferenzierung deaktivieren" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." msgstr "Erste WMS-Ebene in Liste wählen." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." +msgstr "" #. item "Man Made/Pipeline" combo "Type" @@ -16500,7 +16362,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -16509,13 +16371,13 @@ msgstr "Wasser" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "Symbol" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "Paket" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "Paketnummer" @@ -16563,32 +16425,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "Adresse" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "Ortschaft" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "Abschnitt" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "Gemeinde" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Automatischen Zwischenspeicher aktivieren." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Max. Speichergröße (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16606,19 +16468,19 @@ "dieses Plugins erstellt wurden, hochladen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "Französisches Kataster-WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" "Wert des Schlüssels \"source\" wenn autosourcing aktiviert ist" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Quelle" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16628,5 +16490,5 @@ "Hintergrundfarbe ersetzen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16636,9 +16498,9 @@ "Nützlich für Texte auf dunklen Hintergründen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Stapeln mehrerer Schichten erlauben" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -16646,120 +16508,120 @@ "durchsichtig." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Ein Rechteck um die vom WMS-Server heruntergeladenen Daten zeichnen" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "Bildauflösung:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "Hohe Auflösung (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "Mittlere Auflösung (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "Niedrige Auflösung (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "Bildfilter Interpolierung" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Nächster Nachbar (am schnellsten) [ Standard ]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "Bilinear (schnell)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "Bikubisch (langsam)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "Multiplikator für Vektordaten:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "Ein Vollbild holen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Kleinere Bilder holen (höhere Qualität, aber mehr Speicherbedarf)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "Feste Quadratgröße (Standard ist 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Feste Größe (von 25 bis 1000 Meter)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "Ebenen:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "Seen, Flüsse, Swimmingpools" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "Gebäude, Bedeckung, unterirdische Konstruktionen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "Symbole, wie christliche Kreuze." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "Grundstücke." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "Grundstücknummern, Strassennamen." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "Adressen, Hausnummern" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "Ortschaft, Weiler, Stätte" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "Katasterabschnitt und -unterabschnitt" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "Administrative Gemeindegrenzen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "Multiplikator für Pixelgrafiken:" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "Anzeige der Querstücke:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Alte Dateien werden automatisch gelöscht, wenn diese Größe überschritten wird" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16768,4 +16630,8 @@ "Wählt automatisch die erste WMS-Ebene aus, falls mehrere Ebenen vorhanden " "sind." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 @@ -17092,5 +16958,5 @@ msgstr "Kommunen-Koordinatenfenster: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -17102,9 +16968,9 @@ "Erzeuge eine neue Datei." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Zwischenspeicher-Formatfehler" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -17113,5 +16979,5 @@ "inkompatibel" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "Lambert-Zonenfehler zwischenspeichern" @@ -17256,5 +17122,5 @@ #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:188 msgid "Child script have returned invalid data." -msgstr "" +msgstr "Skripte haben ungültige Daten zurückgelieferte." #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45 @@ -17283,5 +17149,5 @@ #, java-format msgid "Delete tool \"{0}\"?" -msgstr "" +msgstr "Werkzeug '' {0}'' löschen?" #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74 @@ -18415,4 +18281,26 @@ msgstr "Ziehen, um das Bild vertikal zu skalieren" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +#, fuzzy +msgid "Create Stops from GTFS ..." +msgstr "Erzeuge Haltepunkte aus GPX ..." + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +#, fuzzy +msgid "Create Stops from a GTFS file" +msgstr "Erzeuge Haltepunkte aus einer GPX-Datei" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "Ein-/Ausgabefehler aufgetreten: {0}" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +#, fuzzy +msgid "GTFS-Stops" +msgstr "Zwischenhalte" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -18454,9 +18342,4 @@ msgid "Create Stops from a GPX file" msgstr "Erzeuge Haltepunkte aus einer GPX-Datei" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" -msgstr "Ein-/Ausgabefehler aufgetreten: {0}" #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83 @@ -20060,5 +19943,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Andere" @@ -20249,5 +20132,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Multipolygon" @@ -20781,5 +20664,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "Fläche" @@ -20826,36 +20709,39 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Kein Bild" - -#. translation note: don't translate quoted words +msgstr "Keine Merkmale" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "Unverbundener Knoten ohne physische Merkmale" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +msgstr "Hat Schlüssel mit \"fixme\" oder \"FIXME\"" + +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +msgstr "Hat Schlüssel \"note\", \"comment\" oder \"description\"" + +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +msgstr "Hat Schlüssel \"created_by\" oder \"converted_by\"" + +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +msgstr "Hat Schlüssel \"watch\"" + +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" -msgstr "" +msgstr "Hat Schlüssel \"source\"" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:62 @@ -20878,7 +20764,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Wege ohne Merkmale" +msgstr "Weg ohne Merkmale (mit Kommentar)" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20934,5 +20819,5 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113 msgid "Sync a video against this GPS track" -msgstr "" +msgstr "Ein Video mit dieser GPS-Spur synchronisieren" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137 @@ -20942,5 +20827,5 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137 msgid "removes current video from layer" -msgstr "" +msgstr "Aktuelles Video aus Ebene entfernen" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144 @@ -20950,5 +20835,5 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144 msgid "starts/pauses video playback" -msgstr "" +msgstr "Videoabspielen starten/anhalten" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151 @@ -20958,5 +20843,5 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151 msgid "jumps n sec back" -msgstr "" +msgstr "n Sekunden zurückspringen" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159 @@ -20966,5 +20851,5 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159 msgid "jumps n sec forward" -msgstr "" +msgstr "n Sekunden vorwärtsspringen" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167 @@ -20991,5 +20876,5 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:183 msgid "loops n sec around current position" -msgstr "" +msgstr "Schleife von n Sekunden um aktuelle Position" #. now the options menu @@ -21000,5 +20885,5 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:193 msgid "follows the video icon automaticly" -msgstr "" +msgstr "Dem Videosymbol automatisch folgen" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203 @@ -21014,5 +20899,5 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:218 msgid "Jump in video for x ms" -msgstr "" +msgstr "Im Video x ms springen" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:214 @@ -21027,13 +20912,13 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:227 msgid "no deinterlacing" -msgstr "" +msgstr "Kein Deinterlacing" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:235 msgid "deinterlacing using line doubling" -msgstr "" +msgstr "Deinterlacing mittels Zeilenverdopplung" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243 msgid "deinterlacing using linear interpolation" -msgstr "" +msgstr "Deinterlacing mit linearer Interpolation" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99 @@ -21043,9 +20928,9 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131 msgid "Unable to find JNA Java library!" -msgstr "" +msgstr "JNA-Javabibliothek wurde nicht gefunden!" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:135 msgid "Unable to find native libvlc library!" -msgstr "" +msgstr "Libvlc-Systembibliothek wurde nicht gefunden!" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 @@ -21721,7 +21606,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:23 -#, fuzzy msgid "Abort file chooser dialog" -msgstr "Dateiauswahldialog abbrechen." +msgstr "Dialogfeld für Dateiauswahl abbrechen" #. Strings in JFileChooser @@ -21833,7 +21717,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Gewählte Datei öffnen." +msgstr "Die gewählte Datei öffnen" #. Strings in JFileChooser @@ -22153,7 +22036,14 @@ msgstr "Plugin zum Umkehren von Änderungssätzen" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -22164,10 +22054,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Bietet Routenführungsmöglichkeiten." #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -22179,5 +22069,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -22188,15 +22078,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Erlaubt Markierungen/Knoten an der aktuellen GPS-Position einzufügen." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Öffnet einen Dialog, um Merkmale in einer Tabelle zu bearbeiten." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -22209,10 +22099,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "Erstellt Reihenhäuser aus einem Häuserblock." #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -22223,5 +22113,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -22232,5 +22122,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -22241,10 +22131,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "Erlaubt es Objekte der OSM-Datenbank wiederherzustellen" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -22256,5 +22146,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -22267,5 +22157,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -22277,15 +22167,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "Leichtes Herunterladen entlang einer langen Reihe verbundener Wege" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "Eine Reihe von nichtverzweigenden verbundenen Wegen auswählen" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -22296,5 +22186,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -22429,5 +22319,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Referenz" @@ -22966,5 +22856,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "Metall" @@ -22977,5 +22867,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "Holz" @@ -23280,8 +23170,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "ja" @@ -23392,8 +23282,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "nein" @@ -23699,5 +23589,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "Service" @@ -23817,5 +23707,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "Wandern" @@ -23964,4 +23854,9 @@ msgid "Edit Motorway Junction" msgstr "Anschlussstelle bearbeiten" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Nummer" #. item "Waypoints/Motorway Junction" text "Number" @@ -24014,13 +23909,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Betreiber" @@ -24288,6 +24183,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Höhe" @@ -25139,5 +25034,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Spannung" @@ -25508,24 +25403,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Öffnungszeiten" @@ -25592,23 +25487,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24/7" @@ -25622,23 +25517,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "Mo-Fr 08:30-20:00" @@ -25652,23 +25547,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00" @@ -25782,6 +25677,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Referenznummer" @@ -25797,5 +25692,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "Tiefgarage" @@ -25809,5 +25704,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Gebühr" @@ -25983,5 +25878,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Rollstuhl" @@ -26019,5 +25914,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Schutzraum" @@ -26025,5 +25920,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Sitzbank" @@ -26142,5 +26037,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Bake" @@ -26879,5 +26774,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Sport" @@ -26952,5 +26847,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -27064,12 +27007,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -27136,12 +27071,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -27155,12 +27082,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -27322,5 +27241,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "Sport" @@ -27347,4 +27267,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "Australian Football" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "Australian Football" @@ -27372,4 +27298,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "Australian Football" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "Kanu" @@ -27412,6 +27344,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "American Football" +#, fuzzy +msgid "gaelic_football" +msgstr "Australian Football" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27452,5 +27385,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "Rugby" @@ -27571,6 +27510,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -27584,5 +27527,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -27604,4 +27546,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "Typ" @@ -27625,6 +27569,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -27637,5 +27585,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -27657,4 +27604,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "Spielfeld" @@ -27677,4 +27626,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "Sporthalle / Fitnesscenter" @@ -27697,4 +27648,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "Stadion" @@ -27717,4 +27670,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "Weg" @@ -27916,158 +27871,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "American Football" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "American Football-Platz bearbeiten" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Australian Football" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Australian Football-Platz bearbeiten" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Australian Football" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Australian Football-Platz bearbeiten" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "American Football-Platz bearbeiten" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Australian Football-Platz bearbeiten" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "American Football-Platz bearbeiten" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "American Football-Platz bearbeiten" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Rugbyplatz bearbeiten" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Rugbyplatz bearbeiten" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Baseballplatz bearbeiten" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Basketballplatz bearbeiten" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golfplatz" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Golfplatz bearbeiten" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "Golfanlage" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Boule-Spielbereich bearbeiten" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Bowls" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Bowls-Spielfeld bearbeiten" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Kricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Kricketspielfeld bearbeiten" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Kricketnetze" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Kricketnetze bearbeiten" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Krocket" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Krocketspielfeld bearbeiten" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Hockeyplatz bearbeiten" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Pelotaplatz bearbeiten" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Schlagball (Racquet)" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Schlagball (Racquet)-Platz bearbeiten" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Rugbyplatz bearbeiten" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Tischtennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Tischtennisplatz bearbeiten" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Tennisplatz bearbeiten" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Zivilisationsbauten" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Gebäude" @@ -28075,5 +28066,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Öffentliches Gebäude" @@ -28081,10 +28072,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Öffentliches Gebäude bearbeiten" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Rathaus" @@ -28092,10 +28083,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Rathaus bearbeiten" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Botschaft" @@ -28103,10 +28094,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Botschaft bearbeiten" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Gericht" @@ -28115,10 +28106,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Gericht bearbeiten" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Gefängnis" @@ -28127,10 +28118,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Gefängnis bearbeiten" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Polizei" @@ -28140,10 +28131,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Polizei bearbeiten" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Feuerwache" @@ -28152,10 +28143,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Feuerwache bearbeiten" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Post" @@ -28163,5 +28154,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Post bearbeiten" @@ -28169,15 +28160,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Kindergarten" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Kindergarten bearbeiten" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Schule" @@ -28185,10 +28176,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Schule bearbeiten" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Universität" @@ -28196,10 +28187,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Universität bearbeiten" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Hochschule" @@ -28207,5 +28198,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "College bearbeiten" @@ -28213,5 +28204,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Kino" @@ -28220,10 +28211,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Kino bearbeiten" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Bibliothek" @@ -28232,9 +28223,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Bibliothek bearbeiten" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Kulturzentrum" @@ -28242,10 +28233,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Kulturzentrum bearbeiten" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Theater" @@ -28254,10 +28245,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Theater bearbeiten" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Kirche" @@ -28267,5 +28258,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Kirche bearbeiten" @@ -28274,6 +28265,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Religion" @@ -28282,66 +28273,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "bahaiistisch" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "buddhistisch" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "christlich" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hinduistisch" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "jainistisch" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "jüdisch" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "moslemisch" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sikhistisch" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "spiritistisch" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoistisch" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "unitarisch" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zoroastrisch" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Konfession" @@ -28350,81 +28341,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglikanisch" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptistisch" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "katholisch" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "evangelikal" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "Zeugen Jehovas" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "lutherisch" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "methodistisch" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormonisch" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "orthodox" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "Pfingstgemeinde" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "presbyterianisch" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestantisch" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "Quäker" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "schiitisch" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "sunnitisch" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Adressen" @@ -28433,5 +28424,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Adressinformationen bearbeiten" @@ -28439,5 +28430,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Hausnummer" @@ -28445,25 +28436,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Hausname" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Straßenname" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Ortsname" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Postleitzahl" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Länderkennung" @@ -28472,5 +28463,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Adressinterpolation bearbeiten" @@ -28478,61 +28469,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Nummernschema" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "ungerade" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "gerade" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "alphabetisch" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Zivilisationsbauten" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Fabrik" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Fabrik bearbeiten" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Turm" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Turm bearbeiten" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "Art des Turms" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "Kommunikation" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "Beobachtung" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Höhe (in Meter)" @@ -28540,25 +28531,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Wasserturm" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Wasserturm bearbeiten" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Gasometer" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Gasometer bearbeiten" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Leuchtturm" @@ -28566,10 +28557,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Leuchtturm bearbeiten" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Windmühle" @@ -28577,10 +28568,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Windmühle bearbeiten" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Pipeline" @@ -28589,41 +28580,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Pipeline bearbeiten" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "Gas" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "Wärme" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "Öl" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "Abwasser" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "Beliebige Substanz" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Ort" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "Unter Wasser" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "oberirdisch" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Kläranlage" @@ -28633,10 +28624,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Kläranlage bearbeiten" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Stationärer Kran" @@ -28644,5 +28635,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Stationären Kran bearbeiten" @@ -28650,10 +28641,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Bake bearbeiten" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Vermessungspunkt" @@ -28661,10 +28652,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Vermessungspunkt bearbeiten" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Überwachungskamera" @@ -28672,23 +28663,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Überwachungskamera bearbeiten" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "im Gebäude" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "im Freien" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "öffentlich" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Stromgenerator" @@ -28698,35 +28689,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Stromgenerator bearbeiten" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "Wind" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "Wasser" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "Fossil" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "Nuklear" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "Kohle" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "Photovoltaik" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Umspannwerk" @@ -28735,10 +28726,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Umspannwerk bearbeiten" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Trafostation" @@ -28747,5 +28738,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Trafostation bearbeiten" @@ -28753,10 +28744,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Liniennummer" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Strommast" @@ -28767,23 +28758,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Strommast bearbeiten" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "Turm" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "Mast" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "Identifikation des Turms" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Stromleitung" @@ -28792,74 +28783,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Stromleitung bearbeiten" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Art der Stromleitung" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "Freileitung (Starkstrom)" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "Freileitung (Schwachstrom)" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Anzahl Leitungen" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Anzahl der Adern (besser: Leiter) je Stromkabel" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "einzeln" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "doppelt" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "dreifach" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "vierfach" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Einrichtungen" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Toiletten" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "limitiert" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Kommentar" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Briefkasten" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telefon" @@ -28868,5 +28859,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Telefon bearbeiten" @@ -28874,5 +28865,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Münzen" @@ -28880,5 +28871,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Scheine" @@ -28886,5 +28877,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Geld- oder Prepaidkarten" @@ -28892,5 +28883,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Konto- oder EC-Karten" @@ -28898,15 +28889,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Kreditkarten" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Telefonkarten" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Recyclingstelle & -container" @@ -28915,5 +28906,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Recyclingstelle oder -container bearbeiten" @@ -28921,35 +28912,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Batterien" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Dosen" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Kleidung" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Altmetall" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "Abfalleimer" @@ -28957,5 +28948,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Abfalleimer bearbeiten" @@ -28964,31 +28955,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "Lehne" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Material" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "Stein" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "Kunststoff" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Farbe" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "schwarz" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "braun" @@ -29067,5 +29058,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -29075,31 +29066,31 @@ msgstr "grün" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "rot" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "blau" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "grau" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "weiß" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Anzahl der Sitzplätze" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Jagdanstand" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Jagdanstand bearbeiten" @@ -29108,30 +29099,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Höhe" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "niedrig" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "halb" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "voll" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Versteck" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Schloß" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Springbrunnen" @@ -29140,10 +29131,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Springbrunnen bearbeiten" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Trinkwasser" @@ -29152,10 +29143,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Trinkwasserabgabe bearbeiten" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Hydrant" @@ -29164,5 +29155,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Hydrant bearbeiten" @@ -29170,5 +29161,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Babyklappe" @@ -29176,15 +29167,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Babyklappe bearbeiten" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Geschäfte" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Autohändler" @@ -29192,10 +29183,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Autohaus bearbeiten" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Fahrradladen" @@ -29204,28 +29195,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Fahrradladen bearbeiten" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermarkt" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Supermarkt bearbeiten" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Drogerie" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Drogerie bearbeiten" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Tante-Emma-Laden" @@ -29233,9 +29224,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Tante-Emma-Laden bearbeiten" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Kiosk" @@ -29243,27 +29234,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Kiosk bearbeiten" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Buchhandlung" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Buchhandlung bearbeiten" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Reisebüro" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Reisebüro bearbeiten" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Fleischer" @@ -29271,9 +29262,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Fleischer bearbeiten" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Bäcker" @@ -29281,9 +29272,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Bäcker bearbeiten" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Blumenladen" @@ -29291,18 +29282,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Blumenladen bearbeiten" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Bioladen" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Bioladen bearbeiten" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Spirituosen" @@ -29310,54 +29301,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Spirituosengeschäft bearbeiten" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Getränke" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Getränkeladen bearbeiten" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Computer" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Computergeschäft bearbeiten" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Elektronikgeschäft" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Elektronikgeschäft bearbeiten" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Hifi-Geschäft bearbeiten" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Mobiliar" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Möbelgeschäft bearbeiten" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Gartenzentrum" @@ -29365,9 +29356,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Gartenzentrum bearbeiten" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Haushaltswaren" @@ -29375,9 +29366,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Haushaltswaren bearbeiten" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Heimwerkerbedarf" @@ -29385,54 +29376,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Geschäft für Heimwerkerbedarf bearbeiten" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Bürobedarf" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Bürobedarf bearbeiten" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Friseur" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Friseur bearbeiten" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Schuhe" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Schuhladen bearbeiten" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Spielzeug" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Spielzeuggeschäft bearbeiten" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Videoverleih" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Videogeschäft bearbeiten" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Chemische Reinigung" @@ -29440,9 +29431,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Chemische Reinigung bearbeiten" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Waschsalon" @@ -29450,9 +29441,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Waschsalon bearbeiten" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Camping (Outdoor)" @@ -29460,24 +29451,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Sportgeschäft bearbeiten" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Optiker" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Optiker bearbeiten" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Verkaufsautomat" @@ -29485,5 +29476,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Automaten bearbeiten" @@ -29491,97 +29482,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Automatenprodukte" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "Fahrscheine" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "Pläne des öffentlichen Nahverkehrs" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "Parkscheine" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "Essen" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "Getränke" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "Süßigkeiten" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "Zigaretten" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "Fotos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "Tiernahrung" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "Zeitungen" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "Spielzeug" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "Briefmarken" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-Karten" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "Telefonkarten" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "Karten/Belege" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "Fahrradschlauch" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "Kondome" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "Tampons" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "Hundekot-Tüten" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "Kundenkarten" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Geld" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Bank" @@ -29589,14 +29580,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Bank bearbeiten" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Geldautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Wechselstube" @@ -29604,5 +29595,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Wechselstube bearbeiten" @@ -29610,15 +29601,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Geldautomat bearbeiten" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Gesundheit" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Arzt" @@ -29626,18 +29617,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Arzt bearbeiten" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Zahnarzt" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Zahnarzt bearbeiten" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Apotheke" @@ -29645,5 +29636,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Apotheke bearbeiten" @@ -29651,9 +29642,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Rezepteinlösung" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Krankenhaus" @@ -29661,10 +29652,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Krankenhaus bearbeiten" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Notfallrettungspunkt" @@ -29673,5 +29664,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Notfallrettungspunkt bearbeiten" @@ -29680,20 +29671,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Punktnummer" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Punktname" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Telefonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Internationale Nummer verwenden, z.B. +49-123-45678)" @@ -29701,5 +29692,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Tierarzt" @@ -29708,64 +29699,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Tierarzt bearbeiten" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Geografie" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Orte" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Kontinent bearbeiten" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Staat" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Staat bearbeiten" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Bundesland" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Bundesland bearbeiten" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Region bearbeiten" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Landkreis" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Landkreis bearbeiten" @@ -29773,15 +29764,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Großstadt" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Großstadt bearbeiten" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Stadt" @@ -29789,10 +29780,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Stadt bearbeiten" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Stadtteil" @@ -29800,25 +29791,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Stadtteil bearbeiten" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Dorf" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Dorf bearbeiten" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Weiler" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Weiler bearbeiten" @@ -29826,5 +29817,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Unbewohnter Ort" @@ -29832,10 +29823,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Unbewohnten Ort bearbeiten" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Insel" @@ -29843,10 +29834,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Insel bearbeiten" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Kleine Insel" @@ -29854,5 +29845,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Kleine Insel bearbeiten" @@ -29860,5 +29851,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Höhleneingang" @@ -29866,10 +29857,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Höhleneingang bearbeiten" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Bergspitze" @@ -29877,10 +29868,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Bergspitze bearbeiten" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Gletscher" @@ -29888,10 +29879,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Gletscher bearbeiten" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Vulkan" @@ -29899,70 +29890,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Vulkan bearbeiten" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Grenzen" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Staat" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Staatsgrenze bearbeiten" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Innerstaatlich" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Innerstaatliche Grenze bearbeiten" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Zivil" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Zivilrechtliche Grenze bearbeiten" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Politisch" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Politische Grenze bearbeiten" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Nationalpark" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Nationalparkgrenze bearbeiten" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Landnutzung" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Baum" @@ -29971,15 +29962,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Baum bearbeiten" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Botanischer Name" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Naturwald" @@ -29988,5 +29979,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Naturwald bearbeiten" @@ -29994,17 +29985,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "Nadelwald" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "Laubwald" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "Mischwald" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Forst" @@ -30013,14 +30004,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Forst bearbeiten" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Naturdenkmal & Reservat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Naturdenkmal oder Reservat bearbeiten" @@ -30028,25 +30019,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Geröll" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Geröll bearbeiten" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Buschland" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Buschland bearbeiten" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Gebirge" @@ -30054,10 +30045,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Gebirge bearbeiten" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Heide" @@ -30065,5 +30056,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Heide bearbeiten" @@ -30071,5 +30062,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Bauernhof" @@ -30078,45 +30069,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Bauernhof bearbeiten" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Ackerland" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Ackerland bearbeiten" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Wiese" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Wiese bearbeiten" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Weinberg" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Weinberg bearbeiten" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Schrebergärten" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Schrebergärten bearbeiten" @@ -30124,25 +30115,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Garten" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Garten bearbeiten" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Gras" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Grasfläche bearbeiten" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Dorfanger" @@ -30150,10 +30141,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Dorfanger bearbeiten" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Öffentlicher Bereich" @@ -30161,20 +30152,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Öffentlichen Bereich bearbeiten" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Park bearbeiten" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Erholungsgebiet" @@ -30182,5 +30173,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Erholungsgebiet bearbeiten" @@ -30188,15 +30179,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Wohngebiet" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Wohngebiet bearbeiten" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Kleiner Friedhof" @@ -30204,9 +30195,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Kleinen Friedhof bearbeiten" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Friedhof" @@ -30214,39 +30205,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Friedhof bearbeiten" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Einkaufsbereich" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Einkaufsbereich bearbeiten" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Gewerbegebiet" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Gewerbegebiet bearbeiten" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Industrie" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Industriegebiet bearbeiten" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Eisenbahngelände" @@ -30254,15 +30245,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Eisenbahngelände bearbeiten" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Militärgebiet" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Militärgebiet bearbeiten" @@ -30270,50 +30261,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Baustellengebiet" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Baustelle bearbeiten" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Baulücke" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Baulücke bearbeiten" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Bauland" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Bauland bearbeiten" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Deponie" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Deponie bearbeiten" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Steinbruch" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Steinbruch bearbeiten" @@ -30323,5 +30314,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Ein Multipolygon bearbeiten" @@ -30333,5 +30324,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "Äußeres Segment" @@ -30339,5 +30330,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "Inneres Segment" @@ -30345,5 +30336,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "Grenze" @@ -30354,5 +30345,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "Grenze anpassen" @@ -30360,36 +30351,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "Grenztyp" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "administrativ" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "national" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "zivil" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "politisch" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "Administrationsebene" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "Teilgebiet" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "Administrationszentrum" @@ -30397,5 +30388,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Abbiegeeinschränkung" @@ -30404,5 +30395,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Abbiegeeinschränkung bearbeiten" @@ -30410,34 +30401,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Einschränkung" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "Nicht links abbiegen" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "Nicht rechts abbiegen" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "Nicht geradeaus" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "Wendeverbot" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "Nur rechts abbiegen" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "Nur links abbiegen" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "Nur geradeaus" @@ -30446,15 +30437,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "Von Weg" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "Über Knoten oder Weg" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "Zu Weg" @@ -30462,5 +30453,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Route" @@ -30469,5 +30460,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Route bearbeiten" @@ -30475,5 +30466,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Routentyp" @@ -30581,5 +30572,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -30590,17 +30581,17 @@ msgstr "Fahrrad" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "Bus" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "Straße" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "Fähre" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "Ski" @@ -30668,5 +30659,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -30676,9 +30667,9 @@ msgstr "Fuß" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "Straßenbahn" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "Umleitung" @@ -30692,10 +30683,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "U-Bahn" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Symbolbeschreibung" @@ -30703,31 +30694,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Netzwerk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "Routenstatus" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "geplant" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "alternativ" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "temporär" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "Verbindung" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Farbe (hex)" @@ -30736,30 +30727,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "Routenabschnitt" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "Vorwärts-Abschnitt" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "Rückwärts-Abschnitt" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "Haltepunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "Vorwärts-Haltepunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "Rückwärts-Haltepunkt" @@ -30986,5 +30977,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "veraltet" @@ -34312,11 +34303,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "Ort" @@ -34330,5 +34321,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "Tiger-Daten" @@ -34684,4 +34675,145 @@ msgstr "Sizilien - Italien" +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "Fehler bei der Kommunikation mit dem Server
Details: {0}" + +#~ msgid "Communication with server failed" +#~ msgstr "Fehler bei der Kommunikation mit dem Server" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Ja, auch wiederherstellen" + +#~ msgid "No, cancel operation" +#~ msgstr "Nein, Operation abbrechen" + +#~ msgid "" +#~ "There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgid_plural "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" +#~ msgstr[0] "" +#~ "Es gibt {0} zusätzlichen Knoten vom Weg {1},
der auf dem Server " +#~ "gelöscht ist.

Soll dieser Knoten auch wiederhergestellt werden?" +#~ msgstr[1] "" +#~ "Es gibt {0} zusätzliche Knoten vom Weg {1},
die auf dem Server " +#~ "gelöscht sind.

Sollen diese Knoten auch wiederhergestellt werden?" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Zusätzliche Knoten wiederherstellen?" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "Es gibt {0} zusätzliches Objekt, das von Relation {1} referenziert " +#~ "wird
und das auf dem Server gelöscht ist.

Soll dieses Objekt " +#~ "auch wiederhergestellt werden?" +#~ msgstr[1] "" +#~ "Es gibt {0} zusätzliche Objekte, die von Relation {1} referenziert " +#~ "werden
und die auf dem Server gelöscht sind.

Sollen diese " +#~ "Objekte auch wiederhergestellt werden?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Abhängige Objekte wiederherstellen?" + +#~ msgid "Visible State:" +#~ msgstr "Löschstatus:" + +#~ msgid "visible (on the server)" +#~ msgstr "sichtbar (auf Server)" + +#~ msgid "not visible (on the server)" +#~ msgstr "nicht sichtbar (auf dem Server)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Exakte Kopie der lokalen Version behalten" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Aus dem lokalen Datensatz löschen" + +#~ msgid "Keep my visible state" +#~ msgstr "Übernehme meinen Löschstatus" + +#~ msgid "Yes, reset the id" +#~ msgstr "Ja, diese ID zurücksetzten" + +#~ msgid "" +#~ "To keep your local version, JOSM
has to reset the id of " +#~ "primitive {0} to 0.
On the next upload the server will assign
it a " +#~ "new id.
Do you agree?" +#~ msgstr "" +#~ "Um Ihre lokale Version zu behalten, muss JOSM
die ID des Objekts " +#~ "{0} auf 0 setzen.
Beim nächsten Hochladen wird der Server eine
neue " +#~ "ID zuweisen.
Stimmen Sie zu?" + +#~ msgid "Reset id to 0" +#~ msgstr "ID auf 0 zurücksetzen" + +#~ msgid "Keep their visible state" +#~ msgstr "Übernehme deren Löschstatus" + +#~ msgid "Yes, purge it" +#~ msgstr "Ja, entfernen" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM wird das Objekt {0} im lokalen Datensatz löschen.
Sind Sie " +#~ "damit einverstanden?" + +#~ msgid "Remove from dataset" +#~ msgstr "Aus dem Datensatz löschen" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Löschstatus ist unterschiedlich." + +#~ msgid "" +#~ "{0} conflict has been resolved automatically by purging " +#~ "{0} object
from the local dataset because it is deleted on the server." +#~ msgid_plural "" +#~ "{0} conflicts have been resolved automatically by " +#~ "purging {0} objects
from the local dataset because they are deleted " +#~ "on the server." +#~ msgstr[0] "" +#~ "{0} Konflikt wurde automatisch aufgelöst indem {0} " +#~ "Objekt
aus dem lokalen Datensatz entfernt wurde, weil es bereits auf " +#~ "dem Server gelöscht wurde." +#~ msgstr[1] "" +#~ "{0} Konflikte wurden automatisch aufgelöst indem {0} " +#~ "Objekte
aus dem lokalen Datensatz entfernt wurden, weil sie bereits " +#~ "auf dem Server gelöscht wurden." + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "{0} Konflikt muss noch gelöst werden.

Bitte öffnen Sie den " +#~ "Konflikt-Dialog und lösen Sie ihn manuell." +#~ msgstr[1] "" +#~ "{0} Konflikte müssen noch gelöst werden.

Bitte öffnen Sie den " +#~ "Konflikt-Dialog und lösen Sie sie manuell." + +#~ msgid "Create house number and street name relation" +#~ msgstr "Hausnummern- und Straßennamenrelation erzeugen" + +#~ msgid "football" +#~ msgstr "American Football" + +#~ msgid "Football" +#~ msgstr "American Football" + #~ msgid "Create non-audio markers when reading GPX." #~ msgstr "Nicht Audio-Marken beim Einlesen von GPX erzeugen." Index: /applications/editors/josm/i18n/po/el.po =================================================================== --- /applications/editors/josm/i18n/po/el.po (revision 22208) +++ /applications/editors/josm/i18n/po/el.po (revision 22209) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" "PO-Revision-Date: 2010-04-20 18:36+0000\n" "Last-Translator: bastik \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:53+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:11+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -237,5 +237,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -243,6 +243,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -328,8 +328,7 @@ msgstr "Δεν υπάρχουν επίπεδα στόχοι" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Προσθήκη Κόμβου..." @@ -651,5 +650,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1037,5 +1036,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1044,5 +1043,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1179,4 +1178,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "" @@ -1455,6 +1455,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1675,6 +1675,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2305,5 +2303,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2546,10 +2544,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Αναζήτηση..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Αναζήτηση αντικειμένων." @@ -2557,67 +2555,67 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Παρακαλώ εισάγετε κείμενο αναζήτησης." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "αντικατάσταση επιλογής" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "προσθήκη στην επιλογή" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "αφαίρεση από την επιλογή" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "διαχωρισμός πεζών/κεφαλαίων" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" "Baker Street - ''Baker'' και ''Street'' σε οποιοδήποτε κλειδί ή όνομα." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" "\"Baker Street\" - ''Baker Street'' σε οποιοδήποτε κλειδί ή όνομα." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak - ''Bak'' οπουδήποτε στο όνομα." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2625,38 +2623,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - χωρίς ''Bak'' στο όνομα." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - κλειδί=foot ορισμένο με οποιαδήποτε τιμή." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - όλα τα αντικείμενα που αλλάχθηκαν από τον χρήστη" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2664,5 +2662,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2670,5 +2668,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2676,5 +2674,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2682,9 +2680,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2692,39 +2690,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - όλα τα αλλαγμένα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - όλα τα επιλεγμένα αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - όλα τα ημιτελή αντικείμενα" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - όλα τα αντικείμενα χωρίς ετικέτες" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2732,12 +2730,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2746,38 +2744,51 @@ msgstr "Φίλτρο" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Αναζήτηση" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Έναρξη αναζήτησης" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Άκυρη προβολή" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Δεν βρέθηκε αποτέλεσμα για ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Τίποτα δεν προστέθηκε στην επιλογή ψάχνοντας για \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Τίποτα δεν αφαιρέθηκε από την επιλογή ψάχνοντας για \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Δεν βρέθηκε τίποτα στην επιλογή ψάχνοντας για \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2785,5 +2796,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2791,5 +2802,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2797,5 +2808,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2803,5 +2814,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2922,8 +2933,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3062,5 +3073,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3187,11 +3198,11 @@ msgstr[1] "Μετακίνηση {0} κόμβων" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3200,5 +3211,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3207,5 +3218,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3243,5 +3254,5 @@ msgstr "Επίλυση {0} διενέξεων ετικετών στη σχέση {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3550,6 +3561,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3559,10 +3570,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3570,5 +3581,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3577,5 +3588,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3583,78 +3594,4 @@ #, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "κείμενο" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -3786,5 +3723,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "φόντο" @@ -3954,5 +3891,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "σιδηρόδρομος" @@ -3973,7 +3910,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4040,7 +3977,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "κτίριο" @@ -4129,5 +4066,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4348,5 +4285,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4645,12 +4582,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Ιδιότητες" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4661,6 +4598,6 @@ msgstr "Ετικέτες" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4668,6 +4605,6 @@ msgstr "Κόμβοι" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4675,9 +4612,9 @@ msgstr "Μέλη" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4686,5 +4623,5 @@ msgstr[1] "Ετικέτες( {0} διενέξεις)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4693,26 +4630,26 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Κόμβοι(με διενέξεις)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4720,25 +4657,25 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Επίλυση σύγκρουσης" @@ -4784,5 +4721,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Η έκδοση μου" @@ -4793,5 +4730,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4805,5 +4742,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Η έκδοση τους" @@ -4874,5 +4811,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4884,5 +4821,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Κάτω" @@ -4982,60 +4919,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Η επικοινωνία με τον διακομιστή απέτυχε" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "Όχι, ακύρωση της λειτουργίας" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5043,123 +4929,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Συντεταγμένες:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(κανένα)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "διαγράφηκε" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "μη διεγραμένο" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "ορατό (στον διακομιστή)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "μη ορατό (στον διακομιστή)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Διατήρηση των συντεταγμένων μου" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Διατήρηση των συντεταγμένων τους" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" msgstr "" @@ -5307,5 +5128,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "όλα" @@ -5385,7 +5206,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5395,6 +5216,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5580,5 +5401,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5636,25 +5457,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Εφαρμογή επίλυσης συγκρούσεων και κλείσιμο του διαλόγου" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Εφαρμογή επίλυσης" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 msgid "Continue resolving" msgstr "Συνέχιση επίλυσης" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5666,22 +5487,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Επίλυση διενέξεων" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5694,43 +5515,122 @@ msgstr "Προσθήκη" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 +msgid "Enable filter" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 +msgid "Hide elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 -msgid "Enable filter" +msgid "Inverse filter" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 -msgid "Hide elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 -msgid "Inverse filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 msgid "Filter mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Σφάλμα φόρτωσης αρχείου" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "κείμενο" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5773,37 +5673,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Εισάγετε τις συντεταγμένες για τον νέο κόμβο." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Χρησιμοποιήστε δεκαδικές μοίρες" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Αρνητικές τιμές υποδεικνείουν Δυτικό/Νότιο ημισφαίριο." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Παρακαλώ εισάγεται ενα έγκυρο γεωγραφικό πλάτος στην κλίμακα -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Παρακαλώ εισάγεται ενα γεωγραφικό πλάτος στην κλίμακα -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Παρακαλώ εισάγεται ενα έγκυρο γεωγραφικό μήκος στην κλίμακα -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Παρακαλώ εισάγεται ενα γεωγραφικό μήκος στην κλίμακα -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Κλείσε το διάλογο και δημιούργησε ένα νέο κόμβο" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Κλείσε το διάλογο, χωρίς δημιουργία νέου κόμβου" @@ -5863,5 +5763,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Σχέσεις" @@ -5909,10 +5809,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -5976,14 +5876,14 @@ msgstr "Επιλ.: Σχεσ.:{0} / WaysQ{1} / Κόμβοι:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Επιλογή: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6687,8 +6587,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6713,6 +6621,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7095,69 +7001,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Όνομα" @@ -7736,5 +7643,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8376,8 +8283,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Τύπος" @@ -8406,6 +8313,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "άγνωστο" @@ -8726,5 +8633,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Εντοπίστηκαν διενέξεις" @@ -9245,4 +9152,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9742,5 +9650,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Περιγραφή" @@ -9791,5 +9699,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -9865,23 +9773,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Επίπεδο Δεδομένων {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "εκτός περιοχής λήψης" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "έκδοση {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9890,34 +9798,11 @@ msgstr[1] "Εντοπίστηκαν {0} διενέξεις" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -9926,32 +9811,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "το {0} αποτελείται από:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "Έκδοση API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Μετατροπή σε επίπεδο GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -12876,4 +12761,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14332,5 +14218,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14600,5 +14486,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Παρεμβολή Διευθύνσεων" @@ -15032,36 +14918,36 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 +msgid "on polygon" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "διεύθυνση" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Δημιουργία νέας σχέσης" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Κτήρια" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Αριθμός" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Επόμενο" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Διευθύνσεις" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15215,10 +15101,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15273,7 +15163,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15282,13 +15172,13 @@ msgstr "νερό" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15336,32 +15226,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "διεύθυνση" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15373,18 +15263,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Πηγή" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15394,5 +15284,5 @@ "προτιμήσεις του JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15400,132 +15290,136 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Ρύθμιση διαφάνειας επιπέδων WMS. Δεξιά για αδιαφανές, αριστερά για διαφανές." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "Τα παλαιότερα αρχεία διαγράφονται αυτόματα όταν ξεπεραστεί αυτό το μέγεθος" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15828,5 +15722,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -15835,14 +15729,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "" @@ -17121,4 +17015,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17159,9 +17072,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -18663,5 +18571,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Άλλο" @@ -18849,5 +18757,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "" @@ -19366,5 +19274,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "" @@ -19407,34 +19315,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Χωρίς εικόνα" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19457,7 +19368,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Κόμβοι ασύνδετοι και χςρίς ετικέτες" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20373,7 +20283,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Άνοιγμα αρχείου." +msgstr "" #. Strings in JFileChooser @@ -20655,7 +20564,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20664,10 +20580,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Παρέχει δυνατότητες δρομολόγησης." #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20676,5 +20592,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20683,15 +20599,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20701,10 +20617,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20713,5 +20629,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20720,5 +20636,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20727,10 +20643,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20739,5 +20655,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20747,5 +20663,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20757,15 +20673,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20774,5 +20690,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -20905,5 +20821,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "" @@ -21442,5 +21358,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "" @@ -21453,5 +21369,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "άλσος" @@ -21756,8 +21672,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "ναι" @@ -21868,8 +21784,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "όχι" @@ -22175,5 +22091,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "" @@ -22293,5 +22209,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "πεζοπορία" @@ -22440,4 +22356,9 @@ msgid "Edit Motorway Junction" msgstr "Επεξεργασία Κόμβου Αυτοκινητοδρόμου" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Αριθμός" #. item "Waypoints/Motorway Junction" text "Number" @@ -22490,13 +22411,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Λειτουργός" @@ -22764,6 +22685,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Υψόμετρο" @@ -23615,5 +23536,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Τάση ρεύματος" @@ -23984,24 +23905,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Ώρες Λειτουργείας" @@ -24068,23 +23989,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "" @@ -24098,23 +24019,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "" @@ -24128,23 +24049,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -24258,6 +24179,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Αριθμός Αναφοράς" @@ -24273,5 +24194,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "υπόγειο" @@ -24285,5 +24206,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Κόστος" @@ -24459,5 +24380,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Αναπηρικό καρότσι" @@ -24495,5 +24416,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Καταφύγιο" @@ -24501,5 +24422,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Παγκάκι" @@ -24618,5 +24539,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Φάρος" @@ -25355,5 +25276,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Αθλητικά" @@ -25428,5 +25349,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25540,12 +25509,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25612,12 +25573,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25631,12 +25584,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -25798,5 +25743,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "άθληση" @@ -25823,4 +25769,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "ποδόσφαιρο" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "" @@ -25848,4 +25800,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "ποδόσφαιρο" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "Κανόε" @@ -25888,5 +25846,6 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" +#, fuzzy +msgid "gaelic_football" msgstr "ποδόσφαιρο" @@ -25928,5 +25887,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "rugby" @@ -26047,6 +26012,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26060,5 +26029,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26080,4 +26048,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "τύπος" @@ -26101,6 +26071,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26113,5 +26087,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26133,4 +26106,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "" @@ -26153,4 +26128,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "αθλητικό κέντρο" @@ -26173,4 +26150,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "στάδιο" @@ -26193,4 +26172,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -26392,158 +26373,194 @@ #: build/trans_presets.java:2070 -msgid "Football" +msgid "Australian Football" +msgstr "" + +#. item "Sport (Ball)/Australian Football" +#: build/trans_presets.java:2071 +msgid "Edit Australian Football" +msgstr "" + +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" msgstr "Ποδόσφαιρο" -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "" - -#: build/trans_presets.java:2076 -msgid "Australian Football" -msgstr "" - -#. item "Sport (Ball)/Australian Football" +#. item "Sport (Ball)/American Football" #: build/trans_presets.java:2077 -msgid "Edit Australian Football" -msgstr "" +#, fuzzy +msgid "Edit American Football" +msgstr "Επεξεργασία Τριτεύοντος Δρόμου" #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Ποδόσφαιρο" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Επεξεργασία Καναλιού" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Ποδόσφαιρο" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Επεξεργασία Καλαθοσφαίρησης" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Επεξεργασία Rugby" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Επεξεργασία Rugby" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Επεξεργασία Baseball" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Καλαθοσφαίρηση" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Επεξεργασία Καλαθοσφαίρησης" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Επεξεργασία Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Επεξεργασία Hockey" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Επεξεργασία Rugby" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Επιτραπέζια Αντισφαίριση" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Επεξεργασία Επιτραπέζιας Αντισφαίρισης" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Αντισφαίριση" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Επεξεργασία Αντισφαίρισης" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Κτήριο" @@ -26551,5 +26568,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Δημόσιο Κτήριο" @@ -26557,10 +26574,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Επεξεργασία Δημοσίου Κτηρίου" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Δημαρχείο" @@ -26568,10 +26585,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Επεξεργασία Δημαρχείου" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Πρεσβεία" @@ -26579,10 +26596,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Επεξεργασία Πρεσβείας" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Δικαστήρια" @@ -26591,10 +26608,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Επεξεργασία Δικαστηρίων" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Φυλακή" @@ -26603,10 +26620,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Επεξεργασία Φυλακής" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Αστυνομία" @@ -26616,10 +26633,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Επεξεργασία Αστυνομίας" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Πυροσβεστείο" @@ -26628,10 +26645,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Επεξεργασία Πυροσβεστείου" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Ταχυδρομείο" @@ -26639,5 +26656,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Επεξεργασία Ταχυδρομείου" @@ -26645,15 +26662,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Νηπιαγωγείο" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Επεξεργασία Νηπιαγωγείου" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Σχολείο" @@ -26661,10 +26678,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Επεξεργασία Σχολείου" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Πανεπιστήμιο" @@ -26672,10 +26689,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Επεξεργασία Πανεπιστημίου" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Κολέγιο" @@ -26683,5 +26700,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Επεξεργασία Κολεγίου" @@ -26689,5 +26706,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Κινηματογράφος" @@ -26696,10 +26713,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Επεξεργασία Κινηματογράφου" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Βιβλιοθήκη" @@ -26708,9 +26725,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Επεξεργασία Βιβλιοθήκης" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Κέντρο Τεχνών" @@ -26718,10 +26735,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Επεξεργασία Κέντρου Τεχνών" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Θέατρο" @@ -26730,10 +26747,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Επεξεργασία Θεάτρου" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Τόπος Λατρείας" @@ -26743,5 +26760,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Επεξεργασία Τόπου Λατρείας" @@ -26750,6 +26767,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Θρησκεία" @@ -26758,66 +26775,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "βουδισμός" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "χριστιανισμός" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "ινδουϊσμός" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "ιουδαϊσμός" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "μουσουλμανισμός" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "ταοϊσμός" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Δόγμα" @@ -26826,81 +26843,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "αγγλικανικό" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "βαπτιστικό" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "καθολικό" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "ευαγγελικό" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "μαρτύρων του Ιεχοβά" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "λουθερανικό" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "ορθόδοξο" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "πεντηκωστής" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "προτεσταντικό" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Διευθύνσεις" @@ -26909,5 +26926,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Επεξεργασία διεύθυνσης" @@ -26915,5 +26932,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Αριθμός σπιτιού" @@ -26921,25 +26938,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Όνομα Σπιτιού" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Όνομα οδού" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Όνομα πόλης" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Ταχυδρομικός Κώδικας" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Κωδικός χώρας" @@ -26948,5 +26965,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Επεξεργασία Παρεμβολής Διευθύνσεων" @@ -26954,61 +26971,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Τρόπος Αρίθμησης" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "Μονά" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "Ζυγά" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Πύργος" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Επεξεργασία Πύργου" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "" @@ -27016,25 +27033,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Υδραγωγείο" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Επεξεργασία Υδραγωγείου" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Μετρητής Αερίου" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Επεξεργασία Μετρητή Αερίου" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Φάρος" @@ -27042,10 +27059,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Επεξεργασία Φάρου" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Ανεμόμυλος" @@ -27053,10 +27070,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Επεξεργασία Ανεμόμυλου" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Αγωγός" @@ -27065,41 +27082,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Επεξεργασία Αγωγού" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "Αέριο" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Θέση" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Βιολογικός Καθαρισμός" @@ -27109,10 +27126,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Επεξεργασία Βιολογικού Καθαρισμού" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Γερανός" @@ -27120,5 +27137,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Επεξεργασία Γερανού" @@ -27126,10 +27143,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Επεξεργασία Φάρου" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "" @@ -27137,10 +27154,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Παρακολούθηση" @@ -27148,23 +27165,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Επεξεργασία Κάμερας Παρακολούθησης" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Γεννήτρια Ρεύματος" @@ -27174,35 +27191,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Επεξεργασία Γεννήτριας Ρεύματος" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "Αέρας" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "Νερό" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "Πυρηνικό" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "Λιγνίτης" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "Φωτοβολταϊκό" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Σταθμός Παραγωγής Ρεύματος" @@ -27211,10 +27228,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Επεξεργασία Σταθμού Παραγωγής Ρεύματος" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Υποσταθμός Ρεύματος" @@ -27223,5 +27240,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Επεξεργασία Υποσταθμού Ρεύματος" @@ -27229,10 +27246,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Πυλώνας Ρεύματος" @@ -27243,23 +27260,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Επεξεργασία Πυλώνα Ρεύματος" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Αγωγός Μεταφοράς Ρεύματος" @@ -27268,74 +27285,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Επεξεργασία Αγωγού Μεταφοράς Ρεύματος" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "μονή" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "διπλή" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "τριπλή" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "τετραπλή" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Τουαλέτες" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Σημείωση" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Γραμματοκιβώτιο" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Τηλέφωνο" @@ -27344,5 +27361,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Επεξεργασία Τηλεφώνου" @@ -27350,5 +27367,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Κέρματα" @@ -27356,5 +27373,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Χαρτονομίσματα" @@ -27362,5 +27379,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "" @@ -27368,5 +27385,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Χρεωστικές Κάρτεσ" @@ -27374,15 +27391,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Πιστωτικές Κάρτες" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Τηλεκάρτες" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Ανακύκλωση" @@ -27391,5 +27408,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Επεξεργασία σταθμού Ανακύκλωσης" @@ -27397,35 +27414,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Μπαταρίες" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Τενεκεδάκια" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Ρούχα" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Γυαλί" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Χαρτί" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Μέταλλα" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "" @@ -27433,5 +27450,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "" @@ -27440,31 +27457,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Υλικό" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "πέτρα" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "πλαστικό" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Χρώμα" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "μαύρο" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "καφέ" @@ -27543,5 +27560,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27551,31 +27568,31 @@ msgstr "πράσινο" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "κόκκινο" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "μπλε" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "γκρι" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "λευκό" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Σύνολο Καθισμάτων" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "" @@ -27584,30 +27601,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Ύψος" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "χαμηλό" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "μισό" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "πλήρες" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Κρυψώνα" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Κλειδαριά" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Συντριβάνι" @@ -27616,10 +27633,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Επεξεργασία Συντριβανίου" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Πόσιμο Νερό" @@ -27628,10 +27645,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Επεξεργασία πόσιμου νερού" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "" @@ -27640,5 +27657,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "" @@ -27646,5 +27663,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Βρεφοδόχος" @@ -27652,15 +27669,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Επεξεργασία Βρεφοδόχου" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Καταστήματα" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "" @@ -27668,10 +27685,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Επεξεργασία Καταστήματος" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "" @@ -27680,28 +27697,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Επεξεργασία Καταστήματος Ποδηλάτων" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Επεξεργασία Supermarket" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "" @@ -27709,9 +27726,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Περίπτερο" @@ -27719,27 +27736,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Επεξεργασία Περιπτέρου" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Ταξιδιωτικό Γραφείο" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Επεξεργασία Ταξιδιωτικού Γραφείου" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Κρεοπωλείο" @@ -27747,9 +27764,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Επεξεργασία Κρεοπωλείου" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Φούρνος" @@ -27757,9 +27774,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Επεξεργασία Φούρνου" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Ανθοπωλείο" @@ -27767,18 +27784,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Επεξεργασία Ανθοπωλείου" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Βιολογικά" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Επεξεργασία Καταστήματος Βιολογικών" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Κάβα Ποτών" @@ -27786,54 +27803,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Επεξεργασία Κάβας Ποτών" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Ποτά" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Υπολογιστές" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Επεξεργασία Καταστήματος Υπολογιστών" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Ηλεκτρονικά" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Ηχοσυστήματα" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Έπιπλα" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Επεξεργασία Καταστήματος Επίπλων" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Είδη Κήπου" @@ -27841,9 +27858,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Σιδηρικά" @@ -27851,9 +27868,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Επεξεργασία Καταστήματος Σιδηρικών" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "" @@ -27861,54 +27878,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Χαρτικά" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Επεξεργασία Χαρτοπωλείου" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Κομμωτήριο" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Επεξεργασία Κομμωτηρίου" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Υποδήματα" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Επεξεργασία Υποδηματοπωλείου" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Παιχνίδια" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Επεξεργασία Καταστήματος Παιχνιδιών" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Στεγνοκαθαριστήριο" @@ -27916,9 +27933,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Επεξεργασία Στεγνοκαθαριστηρίου" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Πλυντήριο" @@ -27926,9 +27943,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Επεξεργασία πλυντηρίου" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "" @@ -27936,24 +27953,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Επεξεργασία Καταστήματος Αθλητικών" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Οπτικός" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Επεξεργασία Οπτικού" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Μηχάνημα Πώλησης" @@ -27961,5 +27978,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Επεξεργασία Μηχανήματος Πώλησης" @@ -27967,97 +27984,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Πωλούμενα Προϊόντα" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "εισητήρια Μέσων Μαζικής Μεταφοράς" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "χάρτες Μέσων Μαζικής Μεταφοράς" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "εισιτήρια Στάθμευσης" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "φαγητό" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "ποτά" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "γλυκά" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "τσιγάρα" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "φωτογραφίες" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "τροφές ζώων" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "εφημερίδες" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "Παιχνίδια" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "Γραμματόσημα" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "Κάρτες SIM" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "κουπόνια" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "Προφυλακτικά" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Μετρητά" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Τράπεζα" @@ -28065,14 +28082,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Επεξεργασία Τράπεζας" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "ΑΤΜ" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Συναλλακτήριο" @@ -28080,5 +28097,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Επεξεργασία Συναλλακτηρίου" @@ -28086,15 +28103,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Επεξεργασία ΑΤΜ" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Υγεία" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Ιατροί" @@ -28102,18 +28119,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Επεξεργασία Ιατρών" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Οδοντίατρος" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Επεξεργασία Οδοντιάτρου" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Φαρμακείο" @@ -28121,5 +28138,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Επεξεργασία Φαρμακείου" @@ -28127,9 +28144,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Νοσοκομείο" @@ -28137,10 +28154,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Επεξεργασία Νοσοκομειου" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "" @@ -28149,5 +28166,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "" @@ -28156,20 +28173,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Αριθμός Σημείου" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Όνομα Σημείου" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Αριθμός Τηλεφώνου" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)" @@ -28177,5 +28194,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Κτηνιατρίο" @@ -28184,64 +28201,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Επεξεργασία Κτηνιατρίου" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Γεωγραφία" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Τοποθεσίες" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Ήπειρος" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Επεξεργασία Ηπείρου" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Χώρα" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Επεξεργασία Χώρας" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Πολιτεία" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Επεξεργασία Πολιτείας" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Περιοχή" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Επεξεργασία Περιοχής" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Περιφέρεια" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Επεξεργασία Περιφέρειας" @@ -28249,15 +28266,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Πόλη" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Επεξεργασία Πόλης" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Κωμόπολη" @@ -28265,10 +28282,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Επεξεργασία Κωμόπολης" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Προάστιο" @@ -28276,25 +28293,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Επεξεργασία Προαστίου" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Χωριό" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Επεξεργασία Χωριού" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Οικισμός" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Επεξεργασία Οικισμού" @@ -28302,5 +28319,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Τοπονύμιο/Περιοχή" @@ -28308,10 +28325,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Επεξεργασία Τοπονυμίου/Περιοχής" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Νησί" @@ -28319,10 +28336,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Επεξεργασία Νησιού" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Νησίδα" @@ -28330,5 +28347,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Επεξεργασία Νησίδας" @@ -28336,5 +28353,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Είσοδος σπηλαίου" @@ -28342,10 +28359,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Επεξεργασία εισόδου σπηλαίου" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Κορυφή" @@ -28353,10 +28370,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Επεξεργασία κορυφής" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Παγετώνας" @@ -28364,10 +28381,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Επεξεργασία παγετώνα" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Ηφαίστειο" @@ -28375,70 +28392,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Επεξεργασία ηφαιστείου" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Όρια" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Εθνικό" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Επεξεργασία Εθνικού Συνόρου" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Διοικητικό" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Επεξεργασία Διοικητικού Ορίου" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Αστικό" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Επεξεργασία Αστικού Ορίου" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Πολιτικό" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Επεξεργασία Πολιτικού Ορίου" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Εθνικό πάρκο" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Χρήση γής" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Δένδρο" @@ -28447,15 +28464,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Επεξεργασία δένδρου" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Βοτανικό όνομα" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Άλσος" @@ -28464,5 +28481,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Επεξεργασία άλσους" @@ -28470,17 +28487,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "Κωνοφόρο" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "φυλλοβόλα" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "Μικτό" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Δάσος" @@ -28489,14 +28506,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Επεξεργασία Δάσους" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Εθνικός Δρυμός" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Επεξεργασία Εθνικού Δρυμού" @@ -28504,25 +28521,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "" @@ -28530,10 +28547,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "" @@ -28541,5 +28558,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "" @@ -28547,5 +28564,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "" @@ -28554,45 +28571,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Χωράφι" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Επεξεργασία Χωραφιού" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Λειβάδι" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Επεξεργασία Λειβαδιού" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Αμπελώνας" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Επεξεργασία Αμπελώνα" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Κλήροι" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "" @@ -28600,25 +28617,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Κήπος" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Επεξεργασία Κήπου" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Γρασίδι" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "" @@ -28626,10 +28643,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "" @@ -28637,20 +28654,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Πάρκο" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Επεξεργασία Πάρκου" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Χώρος αναψυχής" @@ -28658,5 +28675,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Επεξεργασία χώρου αναψυχής" @@ -28664,15 +28681,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Οικιστική περιοχή" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Επεξεργασία οικιστικής περιοχής" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Νεκροταφείο" @@ -28680,9 +28697,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Επεξεργασία Νεκροταφείου" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Κοιμητήριο" @@ -28690,39 +28707,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Επεξεργασία χρήσης γης κοιμητηρίου" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Βιομηχανική" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "" @@ -28730,15 +28747,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Στρατιωτικά" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "" @@ -28746,50 +28763,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Εγοτάξιο" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Επεξεργασία εργοταξίου" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "ΧΥΤΑ" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Επεξεργασία Χρήσης γης ΧΥΤΑ" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Λατομείο" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Επεξεργασία Λατομείου" @@ -28799,5 +28816,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "" @@ -28809,5 +28826,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "εξωτερικός τομέας" @@ -28815,5 +28832,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "εσωτερικός τομέας" @@ -28821,5 +28838,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -28830,5 +28847,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -28836,36 +28853,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -28873,5 +28890,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Περιορισμός στροφής" @@ -28880,5 +28897,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Επεξεργασία περιορισμού στροφής" @@ -28886,34 +28903,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Περιορισμός" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "όχι_αριστερή_στροφή" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "όχι_δεξιά_στροφή" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "όχι_ευθεία" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "όχι_αναστροφή" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "μόνο_δεξιά_στροφή" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "μόνο_αριστερή_στροφή" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "μόνο_ευθεία" @@ -28922,15 +28939,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "" @@ -28938,5 +28955,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Διαδρομή" @@ -28945,5 +28962,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Επεξεργασία Διαδρομής" @@ -28951,5 +28968,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Τύπος Διαδρομής" @@ -29057,5 +29074,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29066,17 +29083,17 @@ msgstr "ποδήλατο" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "λεωφορείο" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "δρόμος" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "Πορθμείο" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "σκι" @@ -29144,5 +29161,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29152,9 +29169,9 @@ msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "τραμ" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "παράκαμψη" @@ -29168,10 +29185,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "υπόγειος" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Περιγραφή συμβόλου" @@ -29179,31 +29196,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Δίκτυο" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "προτεινόμενο" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "εναλλακτικό" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "προσωρινό" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "σύνδεση" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Χρώμα (δεκαεξαδικό)" @@ -29212,30 +29229,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "τμήμα διαδρομής" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "" @@ -29462,5 +29479,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "παρωχημένο" @@ -32788,11 +32805,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "" @@ -32806,5 +32823,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" @@ -33160,4 +33177,16 @@ msgstr "" +#~ msgid "Communication with server failed" +#~ msgstr "Η επικοινωνία με τον διακομιστή απέτυχε" + +#~ msgid "No, cancel operation" +#~ msgstr "Όχι, ακύρωση της λειτουργίας" + +#~ msgid "visible (on the server)" +#~ msgstr "ορατό (στον διακομιστή)" + +#~ msgid "not visible (on the server)" +#~ msgstr "μη ορατό (στον διακομιστή)" + #~ msgid "Do not show again" #~ msgstr "Να μην εμφανιστεί ξανά" @@ -33775,7 +33804,4 @@ #~ msgstr "Αλλάξτε την προβολή σε {0} πρώτα." -#~ msgid "Invalid projection" -#~ msgstr "Άκυρη προβολή" - #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)" #~ msgstr "" Index: /applications/editors/josm/i18n/po/en_AU.po =================================================================== --- /applications/editors/josm/i18n/po/en_AU.po (revision 22208) +++ /applications/editors/josm/i18n/po/en_AU.po (revision 22209) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" "PO-Revision-Date: 2010-06-15 17:47+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:51+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:08+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -243,5 +243,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -249,6 +249,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -336,8 +336,7 @@ msgstr "No target layers" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Add Node..." @@ -661,5 +660,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1042,5 +1041,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1049,5 +1048,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1185,4 +1184,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "" @@ -1474,6 +1474,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1695,6 +1695,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2331,5 +2329,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2575,10 +2573,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Search..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Search for objects." @@ -2586,65 +2584,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Please enter a filter string." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Please enter a search string." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Enter the search expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "replace selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "add to selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "remove from selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "find in selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "case sensitive" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "all objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "regular expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "Baker Street - ''Baker'' and ''Street'' in any key or name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "\"Baker Street\" - ''Baker Street'' in any key or name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak - ''Bak'' anywhere in the name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - key ''type'' with value exactly ''route''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2654,21 +2652,21 @@ "type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - not ''Bak'' in the name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "oneway? - oneway=yes, true, 1 or on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot set to any value." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Special targets:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2676,17 +2674,17 @@ "type: - type of the object (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - all objects changed by user" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "user:anonymous - all objects changed by anonymous users" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - object with given ID (0 for new objects)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2696,5 +2694,5 @@ "assigned version)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2704,5 +2702,5 @@ "assigned changeset)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2712,5 +2710,5 @@ "min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2720,9 +2718,9 @@ "max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2732,21 +2730,21 @@ "12T14:51:09Z, 2009-11-12 or T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - all changed objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - all selected objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - all incomplete objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - all untagged objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2754,5 +2752,5 @@ "child expr - all children of objects matching the expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2760,13 +2758,13 @@ "parent expr - all parents of objects matching the expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "Use | or OR to combine with logical or" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Use \" to quote operators (e.g. if key contains :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2776,12 +2774,12 @@ "escaped by a preceding \\ (e.g. \\\" and \\\\)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Use ( and ) to group expressions" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2790,38 +2788,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Search" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Submit filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Start Search" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Enter a search expression" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "No match found for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nothing added to selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nothing removed from selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Nothing found in selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2829,5 +2840,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2835,5 +2846,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2841,5 +2852,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2847,5 +2858,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2975,8 +2986,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3119,5 +3130,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3245,11 +3256,11 @@ msgstr[1] "Move {0} nodes" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Purged object ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3258,5 +3269,5 @@ msgstr[1] "Purged {0} objects" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3267,5 +3278,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3303,5 +3314,5 @@ msgstr "Resolve {0} tag conflicts in relation {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3639,6 +3650,6 @@ "error, it should be safe to continue in your work." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3648,10 +3659,10 @@ msgstr "Missing merge target for way with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Missing merge target for object with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3659,5 +3670,5 @@ msgstr "Missing merge target for node with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3666,5 +3677,5 @@ msgstr "Missing merge target for relation with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3673,78 +3684,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "Missing merge target of type {0} with id {1}" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "E" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "H" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Text" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "R" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "A" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "D" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "F" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3882,5 +3819,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "background" @@ -4008,12 +3945,10 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (France)" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "UTM20 North Geodesic system" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4055,5 +3990,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "railway" @@ -4074,7 +4009,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4141,7 +4076,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "building" @@ -4230,5 +4165,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4457,5 +4392,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4769,12 +4704,12 @@ msgstr "role {0} is not participating in compare pair {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Properties" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4785,6 +4720,6 @@ msgstr "Tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4792,6 +4727,6 @@ msgstr "Nodes" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4799,9 +4734,9 @@ msgstr "Members" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "No pending tag conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4810,5 +4745,5 @@ msgstr[1] "Tags({0} conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4817,9 +4752,9 @@ msgstr[1] "{0} pending tag conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Nodes(resolved)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4827,17 +4762,17 @@ "Merged node list frozen. No pending conflicts in the node list of this way" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Nodes(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Pending conflicts in the node list of this way" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Members(resolved)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4847,25 +4782,25 @@ "relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Members(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Pending conflicts in the member list of this relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "No pending property conflicts" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Properties(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Pending property conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Conflict Resolution" @@ -4913,5 +4848,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "My version" @@ -4922,5 +4857,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4936,5 +4871,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Their version" @@ -5012,5 +4947,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -5022,5 +4957,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Down" @@ -5124,70 +5059,9 @@ msgstr "Merged nodes not frozen yet. Cannot build resolution command." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" -"An error occurred while communicating with the server
Details: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Communication with server failed" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Yes, undelete them too" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "No, cancel operation" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -">There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgstr[1] "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Undelete additional nodes?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgstr[1] "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete them too?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Undelete dependent primitives?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Properties in my dataset, i.e. the local dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5197,126 +5071,59 @@ "elements when merge decisions are applied." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Properties in their dataset, i.e. the server dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Coordinates:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Deleted State:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Visible State:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "Referenced by:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(none)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "deleted" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "not deleted" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "visible (on the server)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "not visible (on the server)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Keep a clone of the local version" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Physically delete from local dataset" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Keep my coordiates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Keep their coordiates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "Undecide conflict between different coordinates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "Keep my deleted state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "Keep their deleted state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "Undecide conflict between deleted state" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "Keep my visible state" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Yes, reset the id" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "Reset id to 0" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Keep their visible state" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Yes, purge it" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Remove from dataset" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "Undecide conflict between visible state" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5463,5 +5270,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "all" @@ -5541,7 +5348,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5551,6 +5358,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5754,5 +5561,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5809,25 +5616,25 @@ "Set the selected elements on the map to the selected items in the list above." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Cancel conflict resolution and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Apply resolved conflicts and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Apply Resolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Close anyway" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Continue resolving" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5844,22 +5651,22 @@ "{1} to return to resolving conflicts." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "Conflict not resolved completely" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Resolve conflicts" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Resolve conflicts for ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Filter objects and hide/disable them." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5872,43 +5679,122 @@ msgstr "Add" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "Add filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Edit filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Delete filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Move filter up." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Move filter down." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Enable filter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Hide elements" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Inverse filter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Filter mode" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Error loading file" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "E" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "H" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Text" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "R" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "A" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "D" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5951,37 +5837,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Enter the coordinates for the new node." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Use decimal degrees." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative values denote Western/Southern hemisphere." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Please enter a valid latitude in the range -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Please enter a latitude in the range -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Please enter a valid longitude in the range -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Please enter a longitude in the range -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Close the dialogue and create a new node" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Close the dialogue, do not create a new node" @@ -6041,5 +5927,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relations" @@ -6087,10 +5973,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -6154,14 +6040,14 @@ msgstr "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Selection: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6873,8 +6759,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6899,6 +6793,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7281,69 +7173,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Name" @@ -7956,5 +7849,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8627,8 +8520,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Type" @@ -8657,6 +8550,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "unknown" @@ -9006,5 +8899,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Conflicts detected" @@ -9571,4 +9464,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -10111,5 +10005,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Description" @@ -10160,5 +10054,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10237,23 +10131,23 @@ "time were omitted." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Data Layer {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "outside downloaded area" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 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" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10262,43 +10156,11 @@ msgstr[1] "There were {0} conflicts detected." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgstr[1] "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialogue and manually resolve it." -msgstr[1] "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialogue and manually resolve them." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "Click to close this dialogue and continue editing" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10307,32 +10169,32 @@ msgstr[1] "{0} deleted" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} consists of:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "unset" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "API version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Convert to GPX layer" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "Dataset consistency test" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "No problems found" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "Following problems found:" @@ -13467,4 +13329,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -15062,5 +14925,5 @@ "

The error message is:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15351,5 +15214,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Address Interpolation" @@ -15783,36 +15646,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Multipolygon" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "address" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Create a new relation" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Buildings" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Number" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Next" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Street" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Addresses" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15979,10 +15843,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "Disable image cropping during georeferencing." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -16037,7 +15905,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -16046,13 +15914,13 @@ msgstr "water" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "symbol" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "parcel" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "parcel number" @@ -16100,32 +15968,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "address" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "locality" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "section" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Enable automatic caching." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Max. cache size (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16143,18 +16011,18 @@ "by this plug-in." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "French cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "Value of key \"source\" when autosourcing is enabled" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16164,5 +16032,5 @@ "JOSM preferences." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16172,127 +16040,127 @@ "Useful for texts on dark backgrounds." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Allows multiple layers stacking" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "Set WMS layers transparency. Right is opaque, left is transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Draw a rectangle around downloaded data from WMS server." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "Image resolution:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "High resolution (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "Medium resolution (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "Low resolution (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "Image filter interpolation:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Nearest-Neighbor (fastest) [ Default ]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "Bilinear (fast)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "Bicubic (slow)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "Vector images grab multiplier:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "Grab one image full screen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Grab smaller images (higher quality but use more memory)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "Fixed size square (default is 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fixed size (from 25 to 1000 metres)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "Layers:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "See, rivers, swimming pools." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "Buildings, covers, underground constructions." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "Symbols like cristian cross." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "Parcels." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "Parcels numbers, street names." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "Address, houses numbers." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "Locality, hamlet, place." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "Cadastral sections and subsections." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "Municipality administrative borders." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "Raster images grab multiplier:" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "Display crosspieces:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Oldest files are automatically deleted when this size is exceeded" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16301,4 +16169,8 @@ "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 @@ -16621,5 +16493,5 @@ msgstr "Commune bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -16630,14 +16502,14 @@ "Create a new one." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Cache Format Error" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "Cache Lambert Zone Error" @@ -17921,4 +17793,24 @@ msgstr "Drag to scale the picture in the Y Axis" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +#, fuzzy +msgid "GTFS-Stops" +msgstr "Stops" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17959,9 +17851,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -19469,5 +19356,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Other" @@ -19657,5 +19544,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Multipolygon" @@ -20183,5 +20070,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "area" @@ -20224,34 +20111,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "No image" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -20274,7 +20164,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Untagged ways" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -21103,7 +20992,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:23 -#, fuzzy msgid "Abort file chooser dialog" -msgstr "Abort tag editing and close dialogue" +msgstr "" #. Strings in JFileChooser @@ -21215,7 +21103,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Please select a file" +msgstr "" #. Strings in JFileChooser @@ -21528,7 +21415,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21539,10 +21433,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Provides routing capabilities." #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21551,5 +21445,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21560,15 +21454,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Allow adding markers/nodes on current gps positions." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Provides a dialogue for editing tags in a tabular grid." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21581,10 +21475,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "Make terraced houses out of single blocks." #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21593,5 +21487,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21602,5 +21496,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21609,10 +21503,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21623,5 +21517,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21631,5 +21525,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21640,15 +21534,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "Easy downloading along a long set of interconnected ways" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21659,5 +21553,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21791,5 +21685,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Reference" @@ -22328,5 +22222,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "metal" @@ -22339,5 +22233,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "wood" @@ -22642,8 +22536,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "yes" @@ -22754,8 +22648,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "no" @@ -23061,5 +22955,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "service" @@ -23179,5 +23073,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "hiking" @@ -23326,4 +23220,9 @@ msgid "Edit Motorway Junction" msgstr "Edit Motorway Junction" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Number" #. item "Waypoints/Motorway Junction" text "Number" @@ -23376,13 +23275,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operator" @@ -23650,6 +23549,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Elevation" @@ -24501,5 +24400,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Voltage" @@ -24870,24 +24769,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Opening Hours" @@ -24954,23 +24853,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24/7" @@ -24984,23 +24883,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "Mo-Fr 08:30-20:00" @@ -25014,23 +24913,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00" @@ -25144,6 +25043,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Reference number" @@ -25159,5 +25058,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "underground" @@ -25171,5 +25070,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Fee" @@ -25345,5 +25244,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Wheelchair" @@ -25381,5 +25280,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Shelter" @@ -25387,5 +25286,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Bench" @@ -25504,5 +25403,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Beacon" @@ -26241,5 +26140,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Sports" @@ -26314,5 +26213,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -26426,12 +26373,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26498,12 +26437,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26517,12 +26448,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -26684,5 +26607,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "sport" @@ -26709,4 +26633,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "australian_football" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "australian_football" @@ -26734,4 +26664,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "australian_football" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "canoeing" @@ -26774,6 +26710,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "football" +#, fuzzy +msgid "gaelic_football" +msgstr "australian_football" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26814,5 +26751,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "rugby" @@ -26933,6 +26876,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26946,5 +26893,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26966,4 +26912,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "type" @@ -26987,6 +26935,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26999,5 +26951,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -27019,4 +26970,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "pitch" @@ -27039,4 +26992,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "sports_centre" @@ -27059,4 +27014,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "stadium" @@ -27079,4 +27036,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "track" @@ -27278,158 +27237,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "American Football" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Edit American Football" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Australian Football" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Edit Australian Football" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Australian Football" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Edit Australian Football" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Edit American Football" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Edit Australian Football" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Edit American Football" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Edit American Football" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Edit Rugby" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Edit Rugby" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Edit Baseball" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Edit Basketball" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Edit Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "golf_course" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Edit Boule" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Bowls" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Edit Bowls" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Edit Cricket" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Cricket Nets" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Edit Cricket Nets" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Edit Croquet" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Edit Hockey" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Edit Pelota" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Racquet" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Edit Racquet" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Edit Rugby" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Table Tennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Edit Table Tennis" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Edit Tennis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Man-Made" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Building" @@ -27437,5 +27432,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Public Building" @@ -27443,10 +27438,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Edit Public Building" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Town hall" @@ -27454,10 +27449,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Edit Town hall" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Embassy" @@ -27465,10 +27460,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Edit Embassy" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Courthouse" @@ -27477,10 +27472,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Edit Courthouse" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Prison" @@ -27489,10 +27484,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Edit Prison" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Police" @@ -27502,10 +27497,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Edit Police" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Fire Station" @@ -27514,10 +27509,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Edit Fire Station" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Post Office" @@ -27525,5 +27520,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Edit Post Office" @@ -27531,15 +27526,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Preschool" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Edit Preschool" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "School" @@ -27547,10 +27542,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Edit School" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "University" @@ -27558,10 +27553,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Edit University" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "College" @@ -27569,5 +27564,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Edit College" @@ -27575,5 +27570,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Cinema" @@ -27582,10 +27577,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Edit Cinema" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Library" @@ -27594,9 +27589,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Edit Library" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Arts Centre" @@ -27604,10 +27599,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Edit Arts Centre" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Theatre" @@ -27616,10 +27611,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Edit Theatre" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Place of Worship" @@ -27629,5 +27624,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Edit Place of Worship" @@ -27636,6 +27631,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Religion" @@ -27644,66 +27639,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "buddhist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "christian" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "jewish" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "muslim" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "unitarian" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zoroastrian" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Denomination" @@ -27712,81 +27707,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglican" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "catholic" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "evangelical" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "jehovahs_witness" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "lutheran" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "methodist" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormon" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "orthodox" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "presbyterian" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestant" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "shia" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "sunni" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Addresses" @@ -27795,5 +27790,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Edit Address Information" @@ -27801,5 +27796,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "House number" @@ -27807,25 +27802,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "House name" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Street name" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "City name" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Post code" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Country code" @@ -27834,5 +27829,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Edit Address Interpolation" @@ -27840,61 +27835,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Numbering scheme" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "odd" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "even" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "alphabetic" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Man Made" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Works" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Edit Works" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Tower" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Edit Tower" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "Tower type" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "communication" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "observation" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Height (metres)" @@ -27902,25 +27897,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Water Tower" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Edit Water Tower" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Gasometer" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Edit Gasometer" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Lighthouse" @@ -27928,10 +27923,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Edit Lighthouse" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Windmill" @@ -27939,10 +27934,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Edit Windmill" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Pipeline" @@ -27951,41 +27946,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Edit Pipeline" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "gas" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "heat" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "oil" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "sewage" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "any substance" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Location" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "underwater" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "overground" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Sewerage Plant" @@ -27995,10 +27990,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Edit Sewerage Plant" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Crane" @@ -28006,5 +28001,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Edit Crane" @@ -28012,10 +28007,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Edit Beacon" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Survey Point" @@ -28023,10 +28018,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Edit Survey Point" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Surveillance" @@ -28034,23 +28029,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Edit Surveillance Camera" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "indoor" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "outdoor" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "public" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Power Generator" @@ -28060,35 +28055,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Edit Power Generator" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "wind" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "hydro" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "coal" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "photovoltaic" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Power Station" @@ -28097,10 +28092,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Edit Power Station" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Power Sub Station" @@ -28109,5 +28104,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Edit Power Sub Station" @@ -28115,10 +28110,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Line reference" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Power Tower" @@ -28129,23 +28124,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Edit Power Tower" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "tower" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "pole" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "Tower reference" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Power Line" @@ -28154,74 +28149,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Edit Power Line" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Line type" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "minor_line" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Amount of Cables" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Number of wires (better: conductors) per power cable" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "single" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "double" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "triple" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "quad" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Amenities" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Toilets" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "limited" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Note" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Post Box" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telephone" @@ -28230,5 +28225,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Edit Telephone" @@ -28236,5 +28231,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Coins" @@ -28242,5 +28237,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Notes" @@ -28248,5 +28243,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Electronic purses and Charge cards" @@ -28254,5 +28249,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Debit cards" @@ -28260,15 +28255,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Credit cards" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Telephone cards" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Recycling" @@ -28277,5 +28272,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Edit Recycling station" @@ -28283,35 +28278,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Batteries" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Cans" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Clothes" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Glass" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Paper" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Scrap Metal" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "Waste Basket" @@ -28319,5 +28314,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Edit Waste Basket" @@ -28326,31 +28321,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "Backrest" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Material" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "stone" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "plastic" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Colour" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "black" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "brown" @@ -28429,5 +28424,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -28437,31 +28432,31 @@ msgstr "green" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "red" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "blue" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "gray" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "white" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Amount of Seats" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Hunting Stand" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Edit Hunting Stand" @@ -28470,30 +28465,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Height" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "low" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "half" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "full" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Hide" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Lock" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Fountain" @@ -28502,10 +28497,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Edit Fountain" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Drinking Water" @@ -28514,10 +28509,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Edit Drinking Water" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Fire Hydrant" @@ -28526,5 +28521,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Edit Fire Hydrant" @@ -28532,5 +28527,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Baby Hatch" @@ -28538,15 +28533,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Edit Baby Hatch" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Shops" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Car Dealer" @@ -28554,10 +28549,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Edit Car Shop" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Bike Dealer" @@ -28566,28 +28561,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Edit Bicycle Shop" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Edit Supermarket" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Chemist" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Edit Chemist" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Convenience Store" @@ -28595,9 +28590,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Edit Convenience Store" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Kiosk" @@ -28605,27 +28600,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Edit Kiosk" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Book Store" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Edit Book Store" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Travel Agency" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Edit Travel Agency" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Butcher" @@ -28633,9 +28628,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Edit Butcher" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Baker" @@ -28643,9 +28638,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Edit Baker" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Florist" @@ -28653,18 +28648,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Edit Florist" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Organic" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Edit Organic Shop" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Alcohol" @@ -28672,54 +28667,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Edit Alcohol Shop" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Beverages" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Edit Beverages Shop" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Computer" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Edit Computer Shop" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Electronics" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Edit Electronics Shop" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Edit Hifi Shop" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Furniture" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Edit Furniture Shop" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Garden Centre" @@ -28727,9 +28722,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Edit Garden Centre" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Hardware" @@ -28737,9 +28732,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Edit Hardware Store" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Do-it-yourself-store" @@ -28747,54 +28742,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Edit Do-it-yourself-store" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Stationery" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Edit Stationery Shop" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Hairdresser" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Edit Hairdresser" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Shoes" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Edit Shoe Shop" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Toys" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Edit Toy Shop" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Video" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Edit Video Shop" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Dry Cleaning" @@ -28802,9 +28797,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Edit Dry Cleaning" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Laundry" @@ -28812,9 +28807,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Edit Laundry" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Outdoor" @@ -28822,24 +28817,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Edit Outdoor Shop" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Edit Sports Shop" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Optician" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Edit Optician" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Vending machine" @@ -28847,5 +28842,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Edit Vending machine" @@ -28853,97 +28848,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Vending products" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "public_transport_tickets" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "public_transport_plans" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "parking_tickets" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "food" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "drinks" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "sweets" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "cigarettes" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "photos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "animal_food" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "news_papers" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "toys" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "stamps" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-cards" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "telephone_vouchers" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "vouchers" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "condoms" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "excrement_bags" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "Account or loyalty cards" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Cash" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Bank" @@ -28951,14 +28946,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Edit Bank" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Automated Teller Machine" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Money Exchange" @@ -28966,5 +28961,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Edit Money Exchange" @@ -28972,15 +28967,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Edit Automated Teller Machine" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Health" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Doctors" @@ -28988,18 +28983,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Edit Doctors" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Dentist" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Edit Dentist" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Pharmacy" @@ -29007,5 +29002,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Edit Pharmacy" @@ -29013,9 +29008,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Dispensing" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Hospital" @@ -29023,10 +29018,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Edit Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Emergency Access Point" @@ -29035,5 +29030,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Edit Emergency Access Point" @@ -29042,20 +29037,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Point Number" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Point Name" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Phone Number" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Use international code, like +12-345-67890)" @@ -29063,5 +29058,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Veterinary" @@ -29070,64 +29065,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Edit Veterinary" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Geography" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Places" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Continent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Edit Continent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Country" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Edit Country" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "State" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Edit State" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Edit Region" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "County" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Edit County" @@ -29135,15 +29130,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "City" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Edit City" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Town" @@ -29151,10 +29146,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Edit Town" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Suburb" @@ -29162,25 +29157,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Edit Suburb" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Village" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Edit Village" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Hamlet" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Edit Hamlet" @@ -29188,5 +29183,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Locality" @@ -29194,10 +29189,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Edit Locality" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Island" @@ -29205,10 +29200,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Edit Island" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Islet" @@ -29216,5 +29211,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Edit Islet" @@ -29222,5 +29217,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Cave Entrance" @@ -29228,10 +29223,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Edit Cave Entrance" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Peak" @@ -29239,10 +29234,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Edit Peak" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Glacier" @@ -29250,10 +29245,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Edit Glacier" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Volcano" @@ -29261,70 +29256,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Edit Volcano" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Boundaries" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "National" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Edit National Boundary" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Administrative" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Edit Administrative Boundary" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Civil" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Edit Civil Boundary" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Political" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Edit Political Boundary" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "National park" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Edit National Park Boundary" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Land use" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Tree" @@ -29333,15 +29328,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Edit Tree" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Botanical Name" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Wood" @@ -29350,5 +29345,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Edit Wood" @@ -29356,17 +29351,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "coniferous" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "deciduous" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "mixed" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Forest" @@ -29375,14 +29370,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Edit Forest Landuse" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Nature Reserve" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Edit Nature Reserve" @@ -29390,25 +29385,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Scree" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Edit Scree" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Scrub" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Edit Scrub" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Fell" @@ -29416,10 +29411,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Edit Fell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Heath" @@ -29427,5 +29422,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Edit Heath" @@ -29433,5 +29428,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Farmyard" @@ -29440,45 +29435,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Edit Farmyard Landuse" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Farmland" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Edit Farmland Landuse" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Meadow" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Edit Meadow Landuse" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Vineyard" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Edit Vineyard Landuse" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Allotments" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Edit Allotments Landuse" @@ -29486,25 +29481,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Garden" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Edit Garden" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Grass" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Edit Grass Landuse" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Village Green" @@ -29512,10 +29507,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Edit Village Green Landuse" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Common" @@ -29523,20 +29518,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Edit Common" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Edit Park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Recreation Ground" @@ -29544,5 +29539,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Edit Recreation Ground Landuse" @@ -29550,15 +29545,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Residential area" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Edit Residential Landuse" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Graveyard" @@ -29566,9 +29561,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Edit Graveyard" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Cemetery" @@ -29576,39 +29571,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Edit Cemetery Landuse" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Retail" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Edit Retail Landuse" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Commercial" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Edit Commercial Landuse" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Industrial" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Edit Industrial Landuse" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Railway land" @@ -29616,15 +29611,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Edit Railway Landuse" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Military" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Edit Military Landuse" @@ -29632,50 +29627,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Construction area" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Edit Construction Landuse" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Brownfield" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Edit Brownfield Landuse" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Greenfield" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Edit Greenfield Landuse" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Landfill" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Edit Landfill Landuse" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Quarry" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Edit Quarry Landuse" @@ -29685,5 +29680,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Edit Multipolygon" @@ -29695,5 +29690,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "outer segment" @@ -29701,5 +29696,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "inner segment" @@ -29707,5 +29702,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -29716,5 +29711,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -29722,36 +29717,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -29759,5 +29754,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Turn restriction" @@ -29766,5 +29761,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Edit Turn Restriction" @@ -29772,34 +29767,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Restriction" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "no left turn" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "no right turn" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "no straight on" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "no U turn" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "only turn right" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "only turn left" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "only straight on" @@ -29808,15 +29803,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "from way" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "via node or way" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "to way" @@ -29824,5 +29819,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Route" @@ -29831,5 +29826,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Edit Route" @@ -29837,5 +29832,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Route type" @@ -29943,5 +29938,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29952,17 +29947,17 @@ msgstr "bicycle" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "road" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "ski" @@ -30030,5 +30025,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -30038,9 +30033,9 @@ msgstr "foot" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "detour" @@ -30054,10 +30049,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "subway" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Symbol description" @@ -30065,31 +30060,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Network" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "Route state" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "proposed" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "alternate" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "temporary" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "connection" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Colour (hex)" @@ -30098,30 +30093,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "route segment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "forward segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "backward segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "halt point" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "forward halt point" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "backward halt point" @@ -30348,5 +30343,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "deprecated" @@ -33674,11 +33669,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "place" @@ -33692,5 +33687,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "tiger_data" @@ -34047,4 +34042,129 @@ #~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" + +#~ msgid "Communication with server failed" +#~ msgstr "Communication with server failed" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Yes, undelete them too" + +#~ msgid "No, cancel operation" +#~ msgstr "No, cancel operation" + +#~ msgid "" +#~ "There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgid_plural "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" +#~ msgstr[0] "" +#~ ">There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgstr[1] "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Undelete additional nodes?" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgstr[1] "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete them too?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Undelete dependent primitives?" + +#~ msgid "Visible State:" +#~ msgstr "Visible State:" + +#~ msgid "visible (on the server)" +#~ msgstr "visible (on the server)" + +#~ msgid "not visible (on the server)" +#~ msgstr "not visible (on the server)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Keep a clone of the local version" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Physically delete from local dataset" + +#~ msgid "Keep my visible state" +#~ msgstr "Keep my visible state" + +#~ msgid "Yes, reset the id" +#~ msgstr "Yes, reset the id" + +#~ msgid "Reset id to 0" +#~ msgstr "Reset id to 0" + +#~ msgid "Keep their visible state" +#~ msgstr "Keep their visible state" + +#~ msgid "Yes, purge it" +#~ msgstr "Yes, purge it" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" + +#~ msgid "Remove from dataset" +#~ msgstr "Remove from dataset" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Undecide conflict between visible state" + +#~ msgid "" +#~ "{0} conflict has been resolved automatically by purging " +#~ "{0} object
from the local dataset because it is deleted on the server." +#~ msgid_plural "" +#~ "{0} conflicts have been resolved automatically by " +#~ "purging {0} objects
from the local dataset because they are deleted " +#~ "on the server." +#~ msgstr[0] "" +#~ "{0} conflict has been resolved automatically by purging " +#~ "{0} object
from the local dataset because it is deleted on the server." +#~ msgstr[1] "" +#~ "{0} conflicts have been resolved automatically by " +#~ "purging {0} objects
from the local dataset because they are deleted " +#~ "on the server." + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialogue and manually resolve it." +#~ msgstr[1] "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialogue and manually resolve them." + +#~ msgid "football" +#~ msgstr "football" + +#~ msgid "Football" +#~ msgstr "American Football" + +#~ msgid "" #~ "There are {0} primitives in your local dataset which
might be " #~ "deleted on the server. If you later try to delete or
update them the " Index: /applications/editors/josm/i18n/po/en_GB.po =================================================================== --- /applications/editors/josm/i18n/po/en_GB.po (revision 22208) +++ /applications/editors/josm/i18n/po/en_GB.po (revision 22209) @@ -11,5 +11,5 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" "PO-Revision-Date: 2010-05-16 13:46+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -19,5 +19,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:13+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -30,5 +30,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -72,5 +72,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -80,5 +80,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -246,5 +246,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -252,6 +252,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -339,8 +339,7 @@ msgstr "No target layers" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Add Node..." @@ -664,5 +663,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1045,5 +1044,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1052,5 +1051,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1188,4 +1187,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "" @@ -1477,6 +1477,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1698,6 +1698,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2334,5 +2332,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2578,10 +2576,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Search..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Search for objects." @@ -2589,65 +2587,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Please enter a filter string." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Please enter a search string." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Enter the search expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "replace selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "add to selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "remove from selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "find in selection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "case sensitive" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "regular expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "Baker Street - ''Baker'' and ''Street'' in any key or name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "\"Baker Street\" - ''Baker Street'' in any key or name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak - ''Bak'' anywhere in the name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - key ''type'' with value exactly ''route''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2657,21 +2655,21 @@ "type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - not ''Bak'' in the name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "oneway? - oneway=yes, true, 1 or on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot set to any value." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Special targets:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2679,17 +2677,17 @@ "type: - type of the object (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - all objects changed by user" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "user:anonymous - all objects changed by anonymous users" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - object with given ID (0 for new objects)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2699,5 +2697,5 @@ "assigned version)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2707,5 +2705,5 @@ "assigned changeset)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2715,5 +2713,5 @@ "min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2723,9 +2721,9 @@ "max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2735,21 +2733,21 @@ "12T14:51:09Z, 2009-11-12 or T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - all changed objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - all selected objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - all incomplete objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - all untagged objects" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2757,5 +2755,5 @@ "child expr - all children of objects matching the expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2763,13 +2761,13 @@ "parent expr - all parents of objects matching the expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "Use | or OR to combine with logical or" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Use \" to quote operators (e.g. if key contains :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2779,12 +2777,12 @@ "escaped by a preceding \\ (e.g. \\\" and \\\\)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Use ( and ) to group expressions" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2793,38 +2791,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Search" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Submit filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Start Search" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Enter a search expression" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "No match found for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nothing added to selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nothing removed from selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Nothing found in selection by searching for ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2832,5 +2843,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2838,5 +2849,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2844,5 +2855,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2850,5 +2861,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2978,8 +2989,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3122,5 +3133,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3248,11 +3259,11 @@ msgstr[1] "Move {0} nodes" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Purged object ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3261,5 +3272,5 @@ msgstr[1] "Purged {0} objects" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3270,5 +3281,5 @@ "{1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3306,5 +3317,5 @@ msgstr "Resolve {0} tag conflicts in relation {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3642,6 +3653,6 @@ "error, it should be safe to continue in your work." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3651,10 +3662,10 @@ msgstr "Missing merge target for way with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Missing merge target for object with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3662,5 +3673,5 @@ msgstr "Missing merge target for node with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3669,5 +3680,5 @@ msgstr "Missing merge target for relation with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3676,78 +3687,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "Missing merge target of type {0} with id {1}" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "E" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "H" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Text" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "R" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "A" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "D" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "F" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3885,5 +3822,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "background" @@ -4011,12 +3948,10 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (France)" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "UTM20 North Geodesic system" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4058,5 +3993,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "railway" @@ -4077,7 +4012,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4144,7 +4079,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "building" @@ -4233,5 +4168,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4460,5 +4395,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4772,12 +4707,12 @@ msgstr "role {0} is not participating in compare pair {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Properties" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4788,6 +4723,6 @@ msgstr "Tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4795,6 +4730,6 @@ msgstr "Nodes" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4802,9 +4737,9 @@ msgstr "Members" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "No pending tag conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4813,5 +4748,5 @@ msgstr[1] "Tags({0} conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4820,9 +4755,9 @@ msgstr[1] "{0} pending tag conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Nodes(resolved)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4830,17 +4765,17 @@ "Merged node list frozen. No pending conflicts in the node list of this way" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Nodes(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Pending conflicts in the node list of this way" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Members(resolved)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4850,25 +4785,25 @@ "relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Members(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Pending conflicts in the member list of this relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "No pending property conflicts" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Properties(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Pending property conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Conflict Resolution" @@ -4916,5 +4851,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "My version" @@ -4925,5 +4860,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4939,5 +4874,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Their version" @@ -5015,5 +4950,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -5025,5 +4960,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Down" @@ -5127,70 +5062,9 @@ msgstr "Merged nodes not frozen yet. Cannot build resolution command." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" -"An error occurred while communicating with the server
Details: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Communication with server failed" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Yes, undelete them too" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "No, cancel operation" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -">There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgstr[1] "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Undelete additional nodes?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgstr[1] "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete them too?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Undelete dependent primitives?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Properties in my dataset, i.e. the local dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5200,126 +5074,59 @@ "elements when merge decisions are applied." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Properties in their dataset, i.e. the server dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Coordinates:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Deleted State:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Visible State:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "Referenced by:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(none)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "deleted" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "not deleted" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "visible (on the server)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "not visible (on the server)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Keep a clone of the local version" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Physically delete from local dataset" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Keep my coordiates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Keep their coordiates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "Undecide conflict between different coordinates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "Keep my deleted state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "Keep their deleted state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "Undecide conflict between deleted state" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "Keep my visible state" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Yes, reset the id" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "Reset id to 0" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Keep their visible state" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Yes, purge it" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Remove from dataset" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "Undecide conflict between visible state" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5466,5 +5273,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "all" @@ -5544,7 +5351,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5554,6 +5361,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5757,5 +5564,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5812,25 +5619,25 @@ "Set the selected elements on the map to the selected items in the list above." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Cancel conflict resolution and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Apply resolved conflicts and close the dialogue" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Apply Resolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Close anyway" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Continue resolving" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5847,22 +5654,22 @@ "{1} to return to resolving conflicts." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "Conflict not resolved completely" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Resolve conflicts" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Resolve conflicts for ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Filter objects and hide/disable them." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5875,43 +5682,122 @@ msgstr "Add" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "Add filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Edit filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Delete filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Move filter up." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Move filter down." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Enable filter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Hide elements" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Inverse filter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Filter mode" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Error loading file" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "E" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "H" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Text" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "R" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "A" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "D" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5954,37 +5840,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Enter the coordinates for the new node." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Use decimal degrees." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative values denote Western/Southern hemisphere." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Please enter a valid latitude in the range -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Please enter a latitude in the range -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Please enter a valid longitude in the range -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Please enter a longitude in the range -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Close the dialogue and create a new node" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Close the dialogue, do not create a new node" @@ -6044,5 +5930,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relations" @@ -6090,10 +5976,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "Download incomplete members of selected relations" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "Download incomplete members" @@ -6157,14 +6043,14 @@ msgstr "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Selection: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6876,8 +6762,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6902,6 +6796,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7284,69 +7176,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Name" @@ -7967,5 +7860,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8638,8 +8531,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Type" @@ -8668,6 +8561,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "unknown" @@ -9017,5 +8910,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Conflicts detected" @@ -9582,4 +9475,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -10122,5 +10016,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Description" @@ -10171,5 +10065,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10248,23 +10142,23 @@ "time were omitted." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Data Layer {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "outside downloaded area" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 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" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10273,43 +10167,11 @@ msgstr[1] "There were {0} conflicts detected." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgstr[1] "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialogue and manually resolve it." -msgstr[1] "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialogue and manually resolve them." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "Click to close this dialogue and continue editing" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10318,32 +10180,32 @@ msgstr[1] "{0} deleted" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} consists of:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "unset" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "API version: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Convert to GPX layer" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "Dataset consistency test" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "No problems found" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "Following problems found:" @@ -13480,4 +13342,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -15083,5 +14946,5 @@ "

The error message is:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15372,5 +15235,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Address Interpolation" @@ -15804,36 +15667,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Multipolygon" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "address" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Create a new relation" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Buildings" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Number" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Next" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Street" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Addresses" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -16002,10 +15866,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "Disable image cropping during georeferencing." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -16060,7 +15928,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -16069,13 +15937,13 @@ msgstr "water" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "symbol" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "parcel" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "parcel number" @@ -16123,32 +15991,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "address" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "locality" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "section" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Enable automatic caching." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Max. cache size (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16166,18 +16034,18 @@ "by this plug-in." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "French cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "Value of key \"source\" when autosourcing is enabled" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16187,5 +16055,5 @@ "JOSM preferences." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16195,127 +16063,127 @@ "Useful for texts on dark backgrounds." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Allows multiple layers stacking" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "Set WMS layers transparency. Right is opaque, left is transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Draw a rectangle around downloaded data from WMS server." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "Image resolution:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "High resolution (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "Medium resolution (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "Low resolution (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "Image filter interpolation:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Nearest-Neighbor (fastest) [ Default ]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "Bilinear (fast)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "Bicubic (slow)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "Vector images grab multiplier:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "Grab one image full screen" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Grab smaller images (higher quality but use more memory)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "Fixed size square (default is 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fixed size (from 25 to 1000 metres)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "Layers:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "See, rivers, swimming pools." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "Buildings, covers, underground constructions." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "Symbols like cristian cross." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "Parcels." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "Parcels numbers, street names." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "Address, houses numbers." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "Locality, hamlet, place." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "Cadastral sections and subsections." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "Municipality administrative borders." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "Raster images grab multiplier:" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "Display crosspieces:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Oldest files are automatically deleted when this size is exceeded" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16324,4 +16192,8 @@ "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 @@ -16644,5 +16516,5 @@ msgstr "Commune bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -16653,14 +16525,14 @@ "Create a new one." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Cache Format Error" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "Cache Lambert Zone Error" @@ -17944,4 +17816,26 @@ msgstr "Drag to scale the picture in the Y Axis" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +#, fuzzy +msgid "Create Stops from GTFS ..." +msgstr "Create Stops from GPX ..." + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +#, fuzzy +msgid "Create Stops from a GTFS file" +msgstr "Create Stops from a GPX file" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "IOException \"{0}\" occurred" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +#, fuzzy +msgid "GTFS-Stops" +msgstr "Stops" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17983,9 +17877,4 @@ msgid "Create Stops from a GPX file" msgstr "Create Stops from a GPX file" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" -msgstr "IOException \"{0}\" occurred" #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83 @@ -19512,5 +19401,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Other" @@ -19700,5 +19589,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Multipolygon" @@ -20226,5 +20115,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "area" @@ -20267,34 +20156,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "No data" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -20317,7 +20209,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Untagged ways" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -21146,7 +21037,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:23 -#, fuzzy msgid "Abort file chooser dialog" -msgstr "Abort tag editing and close dialogue" +msgstr "" #. Strings in JFileChooser @@ -21258,7 +21148,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Please select a file" +msgstr "" #. Strings in JFileChooser @@ -21571,7 +21460,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21582,10 +21478,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Provides routing capabilities." #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21594,5 +21490,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21603,15 +21499,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Allow adding markers/nodes on current gps positions." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Provides a dialogue for editing tags in a tabular grid." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21624,10 +21520,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "Make terraced houses out of single blocks." #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21636,5 +21532,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21645,5 +21541,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21654,10 +21550,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21668,5 +21564,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21676,5 +21572,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21685,15 +21581,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "Easy downloading along a long set of interconnected ways" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "Select a sequence of non-branching connected ways" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21704,5 +21600,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21836,5 +21732,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Reference" @@ -22373,5 +22269,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "metal" @@ -22384,5 +22280,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "wood" @@ -22687,8 +22583,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "yes" @@ -22799,8 +22695,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "no" @@ -23106,5 +23002,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "service" @@ -23224,5 +23120,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "hiking" @@ -23371,4 +23267,9 @@ msgid "Edit Motorway Junction" msgstr "Edit Motorway Junction" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Number" #. item "Waypoints/Motorway Junction" text "Number" @@ -23421,13 +23322,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operator" @@ -23695,6 +23596,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Elevation" @@ -24546,5 +24447,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Voltage" @@ -24915,24 +24816,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Opening Hours" @@ -24999,23 +24900,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24/7" @@ -25029,23 +24930,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "Mo-Fr 08:30-20:00" @@ -25059,23 +24960,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00" @@ -25189,6 +25090,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Reference number" @@ -25204,5 +25105,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "underground" @@ -25216,5 +25117,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Fee" @@ -25390,5 +25291,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Wheelchair" @@ -25426,5 +25327,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Shelter" @@ -25432,5 +25333,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Bench" @@ -25549,5 +25450,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Beacon" @@ -26286,5 +26187,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Sports" @@ -26359,5 +26260,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -26471,12 +26420,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26543,12 +26484,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26562,12 +26495,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -26729,5 +26654,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "sport" @@ -26754,4 +26680,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "australian_football" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "australian_football" @@ -26779,4 +26711,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "australian_football" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "canoeing" @@ -26819,6 +26757,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "football" +#, fuzzy +msgid "gaelic_football" +msgstr "australian_football" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26859,5 +26798,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "rugby" @@ -26978,6 +26923,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26991,5 +26940,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -27011,4 +26959,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "type" @@ -27032,6 +26982,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -27044,5 +26998,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -27064,4 +27017,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "pitch" @@ -27084,4 +27039,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "sports_centre" @@ -27104,4 +27061,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "stadium" @@ -27124,4 +27083,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "track" @@ -27323,158 +27284,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "American Football" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Edit American Football" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Australian Football" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Edit Australian Football" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Australian Football" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Edit Australian Football" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Edit American Football" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Edit Australian Football" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Edit American Football" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Edit American Football" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Edit Rugby" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Edit Rugby" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Edit Baseball" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Edit Basketball" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Edit Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "golf_course" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Edit Boule" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Bowls" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Edit Bowls" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Edit Cricket" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Cricket Nets" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Edit Cricket Nets" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Edit Croquet" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Edit Hockey" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Edit Pelota" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Racquet" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Edit Racquet" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Edit Rugby" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Table Tennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Edit Table Tennis" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Edit Tennis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Man-Made" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Building" @@ -27482,5 +27479,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Public Building" @@ -27488,10 +27485,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Edit Public Building" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Town hall" @@ -27499,10 +27496,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Edit Town hall" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Embassy" @@ -27510,10 +27507,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Edit Embassy" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Courthouse" @@ -27522,10 +27519,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Edit Courthouse" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Prison" @@ -27534,10 +27531,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Edit Prison" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Police" @@ -27547,10 +27544,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Edit Police" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Fire Station" @@ -27559,10 +27556,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Edit Fire Station" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Post Office" @@ -27570,5 +27567,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Edit Post Office" @@ -27576,15 +27573,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Preschool" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Edit Preschool" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "School" @@ -27592,10 +27589,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Edit School" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "University" @@ -27603,10 +27600,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Edit University" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "College" @@ -27614,5 +27611,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Edit College" @@ -27620,5 +27617,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Cinema" @@ -27627,10 +27624,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Edit Cinema" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Library" @@ -27639,9 +27636,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Edit Library" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Arts Centre" @@ -27649,10 +27646,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Edit Arts Centre" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Theatre" @@ -27661,10 +27658,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Edit Theatre" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Place of Worship" @@ -27674,5 +27671,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Edit Place of Worship" @@ -27681,6 +27678,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Religion" @@ -27689,66 +27686,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "buddhist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "christian" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "jewish" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "muslim" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "unitarian" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zoroastrian" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Denomination" @@ -27757,81 +27754,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglican" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "catholic" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "evangelical" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "jehovahs_witness" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "lutheran" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "methodist" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormon" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "orthodox" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "presbyterian" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestant" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "shia" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "sunni" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Addresses" @@ -27840,5 +27837,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Edit Address Information" @@ -27846,5 +27843,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "House number" @@ -27852,25 +27849,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "House name" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Street name" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "City name" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Post code" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Country code" @@ -27879,5 +27876,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Edit Address Interpolation" @@ -27885,61 +27882,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Numbering scheme" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "odd" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "even" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "alphabetic" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Man Made" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Works" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Edit Works" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Tower" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Edit Tower" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "Tower type" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "communication" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "observation" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Height (metres)" @@ -27947,25 +27944,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Water Tower" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Edit Water Tower" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Gasometer" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Edit Gasometer" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Lighthouse" @@ -27973,10 +27970,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Edit Lighthouse" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Windmill" @@ -27984,10 +27981,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Edit Windmill" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Pipeline" @@ -27996,41 +27993,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Edit Pipeline" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "gas" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "heat" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "oil" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "sewage" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "any substance" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Location" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "underwater" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "overground" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Sewerage Plant" @@ -28040,10 +28037,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Edit Sewerage Plant" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Crane" @@ -28051,5 +28048,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Edit Crane" @@ -28057,10 +28054,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Edit Beacon" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Survey Point" @@ -28068,10 +28065,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Edit Survey Point" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Surveillance" @@ -28079,23 +28076,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Edit Surveillance Camera" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "indoor" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "outdoor" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "public" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Power Generator" @@ -28105,35 +28102,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Edit Power Generator" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "wind" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "hydro" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "coal" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "photovoltaic" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Power Station" @@ -28142,10 +28139,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Edit Power Station" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Power Sub Station" @@ -28154,5 +28151,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Edit Power Sub Station" @@ -28160,10 +28157,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Line reference" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Power Tower" @@ -28174,23 +28171,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Edit Power Tower" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "tower" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "pole" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "Tower reference" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Power Line" @@ -28199,74 +28196,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Edit Power Line" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Line type" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "minor_line" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Amount of Cables" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Number of wires (better: conductors) per power cable" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "single" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "double" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "triple" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "quad" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Amenities" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Toilets" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "limited" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Note" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Post Box" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telephone" @@ -28275,5 +28272,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Edit Telephone" @@ -28281,5 +28278,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Coins" @@ -28287,5 +28284,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Notes" @@ -28293,5 +28290,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Electronic purses and Charge cards" @@ -28299,5 +28296,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Debit cards" @@ -28305,15 +28302,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Credit cards" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Telephone cards" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Recycling" @@ -28322,5 +28319,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Edit Recycling station" @@ -28328,35 +28325,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Batteries" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Cans" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Clothes" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Glass" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Paper" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Scrap Metal" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "Waste Basket" @@ -28364,5 +28361,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Edit Waste Basket" @@ -28371,31 +28368,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "Backrest" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Material" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "stone" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "plastic" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Colour" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "black" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "brown" @@ -28474,5 +28471,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -28482,31 +28479,31 @@ msgstr "green" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "red" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "blue" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "gray" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "white" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Amount of Seats" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Hunting Stand" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Edit Hunting Stand" @@ -28515,30 +28512,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Height" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "low" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "half" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "full" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Hide" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Lock" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Fountain" @@ -28547,10 +28544,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Edit Fountain" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Drinking Water" @@ -28559,10 +28556,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Edit Drinking Water" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Fire Hydrant" @@ -28571,5 +28568,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Edit Fire Hydrant" @@ -28577,5 +28574,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Baby Hatch" @@ -28583,15 +28580,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Edit Baby Hatch" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Shops" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Car Dealer" @@ -28599,10 +28596,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Edit Car Shop" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Bike Dealer" @@ -28611,28 +28608,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Edit Bicycle Shop" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Edit Supermarket" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Chemist" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Edit Chemist" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Convenience Store" @@ -28640,9 +28637,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Edit Convenience Store" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Kiosk" @@ -28650,27 +28647,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Edit Kiosk" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Book Store" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Edit Book Store" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Travel Agency" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Edit Travel Agency" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Butcher" @@ -28678,9 +28675,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Edit Butcher" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Baker" @@ -28688,9 +28685,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Edit Baker" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Florist" @@ -28698,18 +28695,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Edit Florist" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Organic" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Edit Organic Shop" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Alcohol" @@ -28717,54 +28714,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Edit Alcohol Shop" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Beverages" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Edit Beverages Shop" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Computer" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Edit Computer Shop" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Electronics" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Edit Electronics Shop" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Edit Hifi Shop" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Furniture" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Edit Furniture Shop" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Garden Centre" @@ -28772,9 +28769,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Edit Garden Centre" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Hardware" @@ -28782,9 +28779,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Edit Hardware Store" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Do-it-yourself-store" @@ -28792,54 +28789,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Edit Do-it-yourself-store" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Stationery" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Edit Stationery Shop" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Hairdresser" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Edit Hairdresser" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Shoes" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Edit Shoe Shop" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Toys" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Edit Toy Shop" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Video" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Edit Video Shop" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Dry Cleaning" @@ -28847,9 +28844,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Edit Dry Cleaning" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Laundry" @@ -28857,9 +28854,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Edit Laundry" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Outdoor" @@ -28867,24 +28864,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Edit Outdoor Shop" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Edit Sports Shop" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Optician" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Edit Optician" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Vending machine" @@ -28892,5 +28889,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Edit Vending machine" @@ -28898,97 +28895,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Vending products" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "public_transport_tickets" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "public_transport_plans" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "parking_tickets" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "food" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "drinks" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "sweets" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "cigarettes" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "photos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "animal_food" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "news_papers" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "toys" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "stamps" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-cards" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "telephone_vouchers" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "vouchers" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "condoms" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "excrement_bags" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "Account or loyalty cards" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Cash" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Bank" @@ -28996,14 +28993,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Edit Bank" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Automated Teller Machine" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Money Exchange" @@ -29011,5 +29008,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Edit Money Exchange" @@ -29017,15 +29014,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Edit Automated Teller Machine" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Health" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Doctors" @@ -29033,18 +29030,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Edit Doctors" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Dentist" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Edit Dentist" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Pharmacy" @@ -29052,5 +29049,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Edit Pharmacy" @@ -29058,9 +29055,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Dispensing" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Hospital" @@ -29068,10 +29065,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Edit Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Emergency Access Point" @@ -29080,5 +29077,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Edit Emergency Access Point" @@ -29087,20 +29084,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Point Number" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Point Name" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Phone Number" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Use international code, like +12-345-67890)" @@ -29108,5 +29105,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Veterinary" @@ -29115,64 +29112,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Edit Veterinary" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Geography" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Places" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Continent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Edit Continent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Country" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Edit Country" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "State" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Edit State" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Edit Region" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "County" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Edit County" @@ -29180,15 +29177,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "City" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Edit City" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Town" @@ -29196,10 +29193,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Edit Town" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Suburb" @@ -29207,25 +29204,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Edit Suburb" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Village" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Edit Village" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Hamlet" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Edit Hamlet" @@ -29233,5 +29230,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Locality" @@ -29239,10 +29236,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Edit Locality" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Island" @@ -29250,10 +29247,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Edit Island" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Islet" @@ -29261,5 +29258,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Edit Islet" @@ -29267,5 +29264,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Cave Entrance" @@ -29273,10 +29270,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Edit Cave Entrance" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Peak" @@ -29284,10 +29281,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Edit Peak" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Glacier" @@ -29295,10 +29292,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Edit Glacier" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Volcano" @@ -29306,70 +29303,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Edit Volcano" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Boundaries" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "National" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Edit National Boundary" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Administrative" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Edit Administrative Boundary" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Civil" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Edit Civil Boundary" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Political" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Edit Political Boundary" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "National park" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Edit National Park Boundary" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Land use" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Tree" @@ -29378,15 +29375,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Edit Tree" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Botanical Name" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Wood" @@ -29395,5 +29392,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Edit Wood" @@ -29401,17 +29398,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "coniferous" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "deciduous" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "mixed" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Forest" @@ -29420,14 +29417,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Edit Forest Landuse" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Nature Reserve" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Edit Nature Reserve" @@ -29435,25 +29432,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Scree" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Edit Scree" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Scrub" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Edit Scrub" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Fell" @@ -29461,10 +29458,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Edit Fell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Heath" @@ -29472,5 +29469,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Edit Heath" @@ -29478,5 +29475,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Farmyard" @@ -29485,45 +29482,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Edit Farmyard Landuse" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Farmland" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Edit Farmland Landuse" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Meadow" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Edit Meadow Landuse" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Vineyard" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Edit Vineyard Landuse" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Allotments" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Edit Allotments Landuse" @@ -29531,25 +29528,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Garden" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Edit Garden" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Grass" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Edit Grass Landuse" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Village Green" @@ -29557,10 +29554,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Edit Village Green Landuse" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Common" @@ -29568,20 +29565,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Edit Common" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Edit Park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Recreation Ground" @@ -29589,5 +29586,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Edit Recreation Ground Landuse" @@ -29595,15 +29592,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Residential area" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Edit Residential Landuse" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Graveyard" @@ -29611,9 +29608,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Edit Graveyard" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Cemetery" @@ -29621,39 +29618,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Edit Cemetery Landuse" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Retail" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Edit Retail Landuse" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Commercial" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Edit Commercial Landuse" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Industrial" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Edit Industrial Landuse" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Railway land" @@ -29661,15 +29658,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Edit Railway Landuse" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Military" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Edit Military Landuse" @@ -29677,50 +29674,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Construction area" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Edit Construction Landuse" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Brownfield" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Edit Brownfield Landuse" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Greenfield" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Edit Greenfield Landuse" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Landfill" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Edit Landfill Landuse" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Quarry" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Edit Quarry Landuse" @@ -29730,5 +29727,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Edit Multipolygon" @@ -29740,5 +29737,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "outer segment" @@ -29746,5 +29743,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "inner segment" @@ -29752,5 +29749,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -29761,5 +29758,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -29767,36 +29764,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -29804,5 +29801,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Turn restriction" @@ -29811,5 +29808,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Edit Turn Restriction" @@ -29817,34 +29814,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Restriction" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "no left turn" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "no right turn" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "no straight on" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "no U turn" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "only turn right" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "only turn left" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "only straight on" @@ -29853,15 +29850,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "from way" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "via node or way" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "to way" @@ -29869,5 +29866,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Route" @@ -29876,5 +29873,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Edit Route" @@ -29882,5 +29879,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Route type" @@ -29988,5 +29985,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29997,17 +29994,17 @@ msgstr "bicycle" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "road" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "ski" @@ -30075,5 +30072,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -30083,9 +30080,9 @@ msgstr "foot" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "detour" @@ -30099,10 +30096,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "subway" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Symbol description" @@ -30110,31 +30107,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Network" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "Route state" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "proposed" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "alternate" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "temporary" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "connection" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Colour (hex)" @@ -30143,30 +30140,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "route segment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "forward segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "backward segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "halt point" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "forward halt point" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "backward halt point" @@ -30393,5 +30390,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "deprecated" @@ -33719,11 +33716,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "place" @@ -33737,5 +33734,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "tiger_data" @@ -34090,4 +34087,129 @@ msgid "Sicily - Italy" msgstr "Sicily - Italy" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" + +#~ msgid "Communication with server failed" +#~ msgstr "Communication with server failed" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Yes, undelete them too" + +#~ msgid "No, cancel operation" +#~ msgstr "No, cancel operation" + +#~ msgid "" +#~ "There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgid_plural "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" +#~ msgstr[0] "" +#~ ">There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgstr[1] "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Undelete additional nodes?" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgstr[1] "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete them too?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Undelete dependent primitives?" + +#~ msgid "Visible State:" +#~ msgstr "Visible State:" + +#~ msgid "visible (on the server)" +#~ msgstr "visible (on the server)" + +#~ msgid "not visible (on the server)" +#~ msgstr "not visible (on the server)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Keep a clone of the local version" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Physically delete from local dataset" + +#~ msgid "Keep my visible state" +#~ msgstr "Keep my visible state" + +#~ msgid "Yes, reset the id" +#~ msgstr "Yes, reset the id" + +#~ msgid "Reset id to 0" +#~ msgstr "Reset id to 0" + +#~ msgid "Keep their visible state" +#~ msgstr "Keep their visible state" + +#~ msgid "Yes, purge it" +#~ msgstr "Yes, purge it" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" + +#~ msgid "Remove from dataset" +#~ msgstr "Remove from dataset" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Undecide conflict between visible state" + +#~ msgid "" +#~ "{0} conflict has been resolved automatically by purging " +#~ "{0} object
from the local dataset because it is deleted on the server." +#~ msgid_plural "" +#~ "{0} conflicts have been resolved automatically by " +#~ "purging {0} objects
from the local dataset because they are deleted " +#~ "on the server." +#~ msgstr[0] "" +#~ "{0} conflict has been resolved automatically by purging " +#~ "{0} object
from the local dataset because it is deleted on the server." +#~ msgstr[1] "" +#~ "{0} conflicts have been resolved automatically by " +#~ "purging {0} objects
from the local dataset because they are deleted " +#~ "on the server." + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialogue and manually resolve it." +#~ msgstr[1] "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialogue and manually resolve them." + +#~ msgid "football" +#~ msgstr "football" + +#~ msgid "Football" +#~ msgstr "American Football" #~ msgid "Move" Index: /applications/editors/josm/i18n/po/es.po =================================================================== --- /applications/editors/josm/i18n/po/es.po (revision 22208) +++ /applications/editors/josm/i18n/po/es.po (revision 22209) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-26 09:51+0000\n" -"Last-Translator: Emilio Gomez Fernandez \n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-07-02 23:41+0000\n" +"Last-Translator: mariomx08 \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:52+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:07+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -246,5 +246,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -252,6 +252,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -338,8 +338,7 @@ msgstr "No hay capas objetivo" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Añadir nodo..." @@ -663,5 +662,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1054,5 +1053,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1061,5 +1060,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1198,4 +1197,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Mover nodo..." @@ -1488,5 +1488,5 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47 msgid "Also rename the file" -msgstr "También cambiar nombre del archivo" +msgstr "También renombrar el archivo" #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93 @@ -1497,6 +1497,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1566,5 +1566,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31 msgid "Reverse Ways" -msgstr "Cambiar el sentido de las vías" +msgstr "Invertir vías" #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30 @@ -1578,5 +1578,5 @@ #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75 msgid "Reverse ways" -msgstr "Cambiar el sentido de las vías" +msgstr "Invertir vías" #. Strings in JFileChooser @@ -1719,6 +1719,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2362,5 +2360,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2611,10 +2609,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Buscar ..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Búsqueda de objetos." @@ -2622,65 +2620,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Por favor, introduce una cadena de caracteres como filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Por favor, introduzca una cadena de búsqueda." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Introduzca la expresión de búsqueda" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "reemplazar selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "añadir a la selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "eliminar de la selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "encontrar en la selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "distinguir mayúsculas" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "todos los objetos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "Incluir en la búsqueda además objetos incompletos o eliminados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "expresión regular" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "Calle Mayor - ''Calle'' y ''Mayor'' en cualquier clave o valor." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "\"Calle Mayor\" - ''Calle Mayor'' en cualquier clave o nombre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:May - ''May'' en cualquier parte del nombre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - clave ''type'' con el valor exacto ''route''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2690,21 +2688,21 @@ "*=valor, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:May - sin ''May'' en el nombre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "¿sentido único? - oneway=yes, true, 1 o on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - cualquier valor presente en clave=foot" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Búsquedas especiales:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2713,19 +2711,19 @@ "relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "" "user:... - todos los objetos modificados por un determinado usuario" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" "usuario:anónimo - todos los objetos modificados por usuarios anónimos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - objecto con el ID indicado (0 para los objetos nuevos)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2735,5 +2733,5 @@ "asignada)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2743,5 +2741,5 @@ "cambios dado (0 objetos sin un conjunto de cambios asignado)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2751,5 +2749,5 @@ "min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2759,9 +2757,9 @@ "min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2771,21 +2769,21 @@ "(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - todos los objetos modificados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - todos los objetos seleccionados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - todos los objetos incompletos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - todos los objetos sin etiquetar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2794,5 +2792,5 @@ "la expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2801,5 +2799,5 @@ "cumplan la expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "" @@ -2807,5 +2805,5 @@ "lógico O (disyunción)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2813,5 +2811,5 @@ "contiene :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2821,12 +2819,12 @@ "escapados precediéndolos con \\ (p. ej. \\\" y \\\\)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Usar ( y ) para agrupar expresiones" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2835,38 +2833,51 @@ msgstr "Filtrar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Enviar filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Iniciar búsqueda" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Introducir una expresión de búsqueda" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "No se encontraron coincidencias para \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "No se ha añadido nada a la selección al buscar \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "No se ha quitado nada de la selección al buscar \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "No se ha encontrado nada en la selección buscando por ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2874,5 +2885,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2880,5 +2891,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2886,5 +2897,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2892,5 +2903,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -3026,8 +3037,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3170,5 +3181,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3298,11 +3309,11 @@ msgstr[1] "Mover {0} nodos" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Eliminado objeto ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3311,5 +3322,5 @@ msgstr[1] "Purgados {0} objetos" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3320,5 +3331,5 @@ "debajo de 2. El actual es {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3356,5 +3367,5 @@ msgstr "Resolver {0} conflictos de etiquetado en la relación {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3699,6 +3710,6 @@ "no es un error crítico, puede continuar con su trabajo de manera segura." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3708,10 +3719,10 @@ msgstr "Falta de combinación de destino para la direccion con el ID {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Falta de combinación de destino para el objeto con el ID {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3719,5 +3730,5 @@ msgstr "Falta de combinación de destino para el nodo con el ID {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3726,5 +3737,5 @@ msgstr "Falta de combinación de destino para la relación con el ID {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3733,79 +3744,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "Blanco de conbinacion perdida del tipo {0} con el ID {1}" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "E" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "H" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Texto" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "R" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "A" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "D" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "F" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

Filtro activo

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} objetos ocultos" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "{0} objetos deshabilitados" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "" -"

Cierre el diálogo de filtrado para ver todos los objetos.

" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3946,5 +3882,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "fondo" @@ -4069,15 +4005,13 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29 msgid "Guyane RGFG95" -msgstr "" +msgstr "Guyana RGFG95" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (Francia)" +msgstr "UTM Francia (DOM)" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "Sistema geodésico UTM20 Norte" +msgstr "Sistema geodésico UTM" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4120,5 +4054,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "ferrocarril" @@ -4139,7 +4073,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4206,7 +4140,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "edificio" @@ -4295,5 +4229,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4524,5 +4458,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4843,12 +4777,12 @@ msgstr "La función {0} no participa en la pareja de comparación {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4859,6 +4793,6 @@ msgstr "Etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4866,6 +4800,6 @@ msgstr "Nodos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4873,9 +4807,9 @@ msgstr "Miembros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Ningún conflito de etiqueta pendiente de ser resuelto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4884,5 +4818,5 @@ msgstr[1] "Etiquetas ({0} conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4891,9 +4825,9 @@ msgstr[1] "{0} conflictos de eitquetas pendientes de resolver" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Nodos (resueltos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4902,17 +4836,17 @@ "lista de nodos de esta vía" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Nodos (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Conflictos pendientes en la lista de nodos de esta vía" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Miembros (resueltos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4922,25 +4856,25 @@ "lista de miembros de esta relación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Miembros (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Conflictos pendientes en la lista de miembros de esta relación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Ningún conflicto de propiedades pendiente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Propiedades (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Conflictos de propiedades pendientes de resolver" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Resolución de conflictos" @@ -4990,5 +4924,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Mi versión" @@ -5001,5 +4935,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -5015,5 +4949,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Su versión" @@ -5098,5 +5032,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -5108,5 +5042,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Bajar" @@ -5212,71 +5146,10 @@ "de resolución." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" -"Ocurrió un error mientras se comunicaba con el servidor
Detalles: " -"{0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Comunicación fallida con el servidor" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Sí, deshacer el borrado de ellos también" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "No, calcelar la operación" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -"Hay {0} nodo adicional usado pur la vía {1}
que ha sido eliminada en el " -"servidor.

¿Quiere que este nodo vuelva a existir?" -msgstr[1] "" -"Hay {0} nodos adicionales usados por la vía {1}
que ha sido eliminada en " -"el servidor.

¿Quiere que estos nodos vuelvan a existir?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "¿Deshacer el borrado de los nodos adicionales?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -"Hay {0} primitiva adicional referida en la relación a {1}
la cual está " -"borrada en el servidor.

¿Desea recuperarla también?" -msgstr[1] "" -"Hay {0} primitivas adicionales referidas en la relación a {1}
las cuales " -"están borradas en el servidor.

¿Desea recuperarlas también?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "¿Deshacer borrado de primitivos dependientes?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" "Propiedade de mi conjunto de datos, es decir el conjunto de datos locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5286,5 +5159,5 @@ "elementos cuando se apliquen las decisiones de fusionar." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" @@ -5292,125 +5165,55 @@ "servidor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Coordenadas:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Estado borrado:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Estado visible:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "Referenciada por:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(ninguno)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "borrado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "no borrado" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "visible (en el servidor)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "no visible (en el servidor)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Mantener un clon de la versión local" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Eliminar físicamente del conjunto de datos locales" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Mantener mis coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Mantener sus coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "Conflicto no resuelto entre las diferentes coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "Mantener mi estado suprimido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "Mantener su estado suprimido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "Conflicto sin resolver entre estados eliminados" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "Mantener mi estado visible" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Sí, reiniciar el id" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" -"Para mantener su versión local JOSM
tiene que restablecer la ID de " -"la primitiva {0} a 0.
En la próxima subida el servidor le asignará
una " -"ID nueva.
¿Está de acuerdo?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "Reiniciar el id a 0" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Mantener su estado visible" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Sí, purgarlo" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM borrará la primitiva local con id {0}
del dataset.
¿Está de " -"acuerdo?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Eliminar desde el conjunto de datos" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "Conflicto entre estado visibles sin decidir" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5565,5 +5368,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "todos" @@ -5643,7 +5446,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5653,6 +5456,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5757,4 +5560,10 @@ "the place of the original node in the relation." msgstr "" +"Los nodos fusionados son miembros en una o más relaciones. Por favor " +"decida si desea mantener esas membresías para el nodo final " +"o si quiere eliminarlas.
Por defecto se " +"mantiene el primer nodo y elimina los " +"otros nodos que son miembros de la misma relación: el nodo final tomará el " +"lugar del nodo original en la relación." #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148 @@ -5859,5 +5668,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5918,25 +5727,25 @@ "Selecciona en el mapa los elementos seleccionados en la lista superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Cancelar la resolución de conflictos y cerrar el cuadro de diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Aplicar la resolución de conflictos y cerrar el cuadro de diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Aplicar resolución" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Cerrar de todos modos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Continuar resolviendo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5947,23 +5756,29 @@ "{1} to return to resolving conflicts." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +"No ha terminado de fusionar las diferencias en este conflicto.
La " +"solución de conflictos no será aplicada a menos de que todas las " +"diferencias
sean resueltas.
Haga clic en {0} para " +"cerrar de todos modos.Ya
resueltas las diferencias no serán " +"aplicadas.
Haga clic en{1} para regresar a " +"resolver conflictos." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "Conflicto no resuelto completamente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Resolver los conflictos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Resolver los conflictos de ''{0}'" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Filtra objetos y los oculta/visualiza." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5976,44 +5791,124 @@ msgstr "Añadir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "Añadir filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Editar filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Borrar filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Subir filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Bajar filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Activar filtro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Ocultar elementos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Invertir filtro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Modo de filtro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "Filtrar Ocultos:{0} Desactivados:{1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Error al leer el archivo" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "E" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "H" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Texto" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "R" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "A" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "D" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

Filtro activo

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} objetos ocultos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "{0} objetos deshabilitados" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "" +"

Cierre el diálogo de filtrado para ver todos los objetos.

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -6056,37 +5951,37 @@ msgstr "Información ampliada sobre el objeto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Introduzca las coordenadas para el nuevo nodo." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Usar grados decimales." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valores negativos denotan hemisferio Oeste/Sur" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Por favor, introduce una latitud válida en el rango -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Por favor, una latitud válida en el rango -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Por favor, introduce una latitud válida en el rango-180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Introduzca una longitud en el rango -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Cerrar el diálogo y crear un nuevo nodo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Cerrar el diálogo, no crear un nuevo nodo" @@ -6146,5 +6041,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relaciones" @@ -6192,10 +6087,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "Descargar miembros incompletos de las relaciones seleccionadas" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "Descargar miembros incompletos" @@ -6231,9 +6126,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:419 msgid "Call editor for relation" -msgstr "" +msgstr "Llame al editor para relacionar" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:420 msgid "Call relation editor for selected relation" -msgstr "" +msgstr "Llame al editor de relaciones para la relación seleccionada" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:447 @@ -6259,14 +6154,15 @@ msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Selección: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +"Obtenga información detallada en el estado interno de los objetos. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -7012,6 +6916,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7394,69 +7296,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Nombre" @@ -7771,4 +7674,6 @@ "include all changesets in the query." msgstr "" +"Seleccione para restringir la información sobre sus cambios solamente." +"
Deseleccione para incluir todos los cambios en la búsqueda." #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:126 @@ -8078,5 +7983,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8752,8 +8657,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Tipo" @@ -8782,6 +8687,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "desconocido" @@ -9110,5 +9015,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Se han detectado conflictos" @@ -9649,4 +9554,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -10170,5 +10076,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Descripción" @@ -10219,5 +10125,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10297,23 +10203,23 @@ "tiempos fueran razonablemente estimados se han omitido." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Capa de datos {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "fuera del área descargada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "versión {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10322,38 +10228,11 @@ msgstr[1] "Se han detectado {0} conflictos." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"{0} conflicto sigue sin resolverse.

Por favor, abra el cuadro de " -"dialogo de Conflictos y resuélvalo manualmente." -msgstr[1] "" -"{0} conflicto2 siguen sin resolverse.

Por favor, abra el cuadro de " -"dialogo de Conflictos y resuélvalos manualmente." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10362,32 +10241,32 @@ msgstr[1] "{0} eliminados" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} formado por:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "sin ajustar" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "Versión del API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Convertir a capa de gpx" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "No se han encontrado problemas" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -13389,4 +13268,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14895,5 +14775,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15173,5 +15053,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Interpolación de números de portales" @@ -15617,36 +15497,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Multipolígono" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "dirección" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Crear una nueva relación" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Edificios" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Número" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Siguiente" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Direcciones" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15802,10 +15683,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15860,7 +15745,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15869,13 +15754,13 @@ msgstr "lámina de agua" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15923,32 +15808,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "dirección" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Activar caché automático" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Tamaño máximo de caché (en MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15966,9 +15851,9 @@ "creado mediante este componente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "WMS del catastro francés" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -15976,10 +15861,10 @@ "activo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Fuente" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15989,5 +15874,5 @@ "preferencias de JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15997,9 +15882,9 @@ "intermedios. Útil para los textos sobre fondos oscuros." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Permitir múltiples capas apiladas" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -16007,5 +15892,5 @@ "transparente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" @@ -16013,111 +15898,111 @@ #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Graba las imágenes más pequeñas (mejor calidad pero mayor uso de memoria)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "Fijar tamaño del cuadrado (por defecto 100 m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Tamaño fijado (desde 25 a 100 m)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "Frontera administrativa municipal." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -16125,8 +16010,12 @@ "tamaño" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16434,5 +16323,5 @@ msgstr "Cuadro de la Comunna: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -16443,14 +16332,14 @@ "Creado uno nuevo." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Error en el formato caché" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "Error en la zona Lambert de la caché" @@ -17744,4 +17633,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17782,9 +17690,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -19332,5 +19235,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Otro" @@ -19520,5 +19423,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Multipolígono" @@ -20057,5 +19960,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "área" @@ -20101,34 +20004,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Sin datos" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -20151,7 +20057,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Vías sin etiquetar" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -21102,7 +21007,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Por favor, seleccione un archivo" +msgstr "" #. Strings in JFileChooser @@ -21428,7 +21332,14 @@ msgstr "Componente para revertir conjuntos de cambios" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21440,10 +21351,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Proporciona capacidades de enrutamiento." #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21455,5 +21366,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21464,10 +21375,10 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Permite añadir marcadores/nodos a las posiciones GPS actual." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" @@ -21476,5 +21387,5 @@ #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21488,10 +21399,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "Crea edificios entremedianeras a partir de bloques únicos" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21502,5 +21413,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21511,5 +21422,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21520,10 +21431,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21535,5 +21446,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21543,5 +21454,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21552,5 +21463,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -21558,10 +21469,10 @@ #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21572,5 +21483,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21705,5 +21616,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Referencia" @@ -22242,5 +22153,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "metal" @@ -22253,5 +22164,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "bosque" @@ -22556,8 +22467,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "sí" @@ -22668,8 +22579,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "no" @@ -22975,5 +22886,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "vía de servicio" @@ -23093,5 +23004,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "senda" @@ -23240,4 +23151,9 @@ msgid "Edit Motorway Junction" msgstr "Editar salida de autopista" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Número" #. item "Waypoints/Motorway Junction" text "Number" @@ -23290,13 +23206,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operador" @@ -23564,6 +23480,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Altitud" @@ -24416,5 +24332,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Voltaje" @@ -24785,24 +24701,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Horario de apertura" @@ -24869,23 +24785,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24/7" @@ -24899,23 +24815,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "Lu-Vie 08:30-20:00" @@ -24929,23 +24845,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00" @@ -25059,6 +24975,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Número de referencia" @@ -25074,5 +24990,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "subterráneo" @@ -25086,5 +25002,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "De pago" @@ -25260,5 +25176,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Silla de ruedas" @@ -25296,5 +25212,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Refugio" @@ -25302,5 +25218,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Banco" @@ -25419,5 +25335,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Baliza" @@ -26156,5 +26072,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Deportes" @@ -26229,5 +26145,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -26341,12 +26305,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26413,12 +26369,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26432,12 +26380,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -26599,5 +26539,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "deporte" @@ -26624,4 +26565,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "fútbol australiano" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "fútbol australiano" @@ -26649,4 +26596,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "fútbol australiano" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "piragua" @@ -26689,6 +26642,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "fútbol" +#, fuzzy +msgid "gaelic_football" +msgstr "fútbol australiano" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26729,5 +26683,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "rugby" @@ -26848,6 +26808,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26861,5 +26825,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26881,4 +26844,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "tipo" @@ -26902,6 +26867,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26914,5 +26883,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26934,4 +26902,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "cancha de juego" @@ -26954,4 +26924,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "Polideportivo" @@ -26974,4 +26946,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "Estadio" @@ -26994,4 +26968,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "pista" @@ -27193,158 +27169,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Fútbol americano" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Editar fútbol americano" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Fútbol australiano" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Editar fútbol australiano" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Fútbol australiano" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Editar fútbol australiano" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Editar fútbol americano" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Editar fútbol australiano" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Editar fútbol americano" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Editar fútbol americano" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Editar rugby" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Editar rugby" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Béisbol" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Editar béisbol" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Baloncesto" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Editar baloncesto" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Editar golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "campo de golf" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Editar boule" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Bolos" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Editar bolos" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Edit cricket" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Cricket con redes" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Editar cricket con redes" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Editar croquet" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Editar hockey" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelota vasca" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Editar pelota vasca" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Raqueta" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Editar raqueta" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Editar rugby" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Ping-pong" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Editar ping-pong" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tenis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Editar tenis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Artificial" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Edificio" @@ -27352,5 +27364,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Edificio público" @@ -27358,10 +27370,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Editar edificio público" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Ayuntamiento" @@ -27369,10 +27381,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Editar ayuntamiento" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Embajada" @@ -27380,10 +27392,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Editar embajada" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Juzgado" @@ -27392,10 +27404,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Editar juzgado" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Prisión" @@ -27404,10 +27416,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Editar prisión" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Policía" @@ -27417,10 +27429,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Editar policía" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Parque de bomberos" @@ -27429,10 +27441,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Editar parque de bomberos" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Oficina postal" @@ -27440,5 +27452,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Editar oficina postal" @@ -27446,15 +27458,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Jardín de infancia" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Editar jardín de infancia" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Escuela" @@ -27462,10 +27474,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Editar escuela" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Universidad" @@ -27473,10 +27485,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Editar universidad" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Instituto de enseñanza secundaria" @@ -27484,5 +27496,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Editar instituto de enseñanza secundaria" @@ -27490,5 +27502,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Cine" @@ -27497,10 +27509,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Editar cine" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Biblioteca" @@ -27509,9 +27521,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Editar biblioteca" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Centro de arte" @@ -27519,10 +27531,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Editar centro de arte" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Teatro" @@ -27531,10 +27543,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Editar teatro" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Lugar de culto" @@ -27544,5 +27556,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Editar lugar de culto" @@ -27551,6 +27563,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Religión" @@ -27559,66 +27571,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "bahaísta" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "budista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "cristiana" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hindú" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "jainista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "judía" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "musulmana" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sijista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "espiritualista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "unitarismo" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zoroástrica" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Confesión" @@ -27627,81 +27639,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglicano" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptista" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "católico" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "evangélico" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "testigos de Jehová" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "luterano" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "metodista" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormón" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "ortodoxo" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "presbiteriano" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestante" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "cuáquero" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "chiita" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "suní" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Direcciones" @@ -27710,5 +27722,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Editar direcciones" @@ -27716,5 +27728,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Número de portal" @@ -27722,25 +27734,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Nombre del edificio" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Nombre de la calle" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Nombre de la ciudad" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Código postal" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Código del país" @@ -27749,5 +27761,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Editar interpolación de números de portales" @@ -27755,61 +27767,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Esquema numérico" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "impares" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "pares" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "alfabético" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Construcciones" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Fábrica" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Editar fábrica" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Torre" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Editar torre" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "Tipo de torre" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "comunicación" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "observación" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Altura (en metros)" @@ -27817,25 +27829,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Torre de agua" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Editar torre de agua" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Gasómetro" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Editar gasómetro" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Faro" @@ -27843,10 +27855,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Editar faro" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Molino de viento" @@ -27854,10 +27866,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Editar molino de viento" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Tubería" @@ -27866,41 +27878,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Editar tubería" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "gas" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "térmico" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "aceite" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "aguas residuales" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "cualquier sustancia" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Localización" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "sumergido" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "en superficie" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Depuradora" @@ -27910,10 +27922,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Editar depuradora" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Grúa" @@ -27921,5 +27933,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Editar grúa" @@ -27927,10 +27939,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Editar baliza" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Vértice geodésico" @@ -27938,10 +27950,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Editar vértice geodésico" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Cámara de vigilacia" @@ -27949,23 +27961,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Editar cámara de vigilancia" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "interiores" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "exteriores" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "público" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Generador de energía" @@ -27975,35 +27987,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Editar generador de energía" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "eólico" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "hidráulico" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fósil" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "carbón" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "fotovoltaico" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Central eléctrica" @@ -28012,10 +28024,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Editar central eléctrica" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Subestación eléctrica" @@ -28024,5 +28036,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Editar subestación eléctrica" @@ -28030,10 +28042,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Línea de referencia" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Torre de electricidad" @@ -28044,23 +28056,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Editar torre de electricidad" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "torre" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "poste" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "Referencia de la torre" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Tendido eléctrico" @@ -28069,74 +28081,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Editar tendido eléctrico" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Tipo de línea" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "alta tensión" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "baja tensión" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Cantidad de cables" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Número de alambres (mejor: conductores) por cable de tensión" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "sencillo" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "doble" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "triple" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "quad" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Servicios" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Baños" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "limitado" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Nota" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Buzón de correos" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Teléfono" @@ -28145,5 +28157,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Editar teléfono" @@ -28151,5 +28163,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Monedas" @@ -28157,5 +28169,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Billetes" @@ -28163,5 +28175,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Tarjetas de recarga y monederos electrónicos" @@ -28169,5 +28181,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Tarjetas de débito" @@ -28175,15 +28187,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Tarjetas de crédito" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Tarjetas telefónicas" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Reciclaje" @@ -28192,5 +28204,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Editar punto limpio" @@ -28198,35 +28210,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Baterías" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Envases" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Ropas" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Vidrio" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Papel" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Chatarra" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "Papeleras" @@ -28234,5 +28246,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Editar papeleras" @@ -28241,31 +28253,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "Respaldo" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Material" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "piedra" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "plástico" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Color" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "negro" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "marrón" @@ -28344,5 +28356,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -28352,31 +28364,31 @@ msgstr "zona verde" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "red" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "azul" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "gris" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "blanco" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Número de asientos" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Apostadero de caza" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Editar apostadero de caza" @@ -28385,30 +28397,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Altura" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "profundidad" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "media" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "total" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Oculto" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Esclusa" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Fuente" @@ -28417,10 +28429,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Editar fuente" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Agua potable" @@ -28429,10 +28441,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Editar agua potable" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Hidrante contra incendios" @@ -28441,5 +28453,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Editar hidrante contra incendios" @@ -28447,5 +28459,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Caja tibia" @@ -28453,15 +28465,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Editar caja tibia" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Comercios" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Concesionario de automóviles" @@ -28469,10 +28481,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Editar concesionario de automóviles" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Tienda de bicicletas" @@ -28481,28 +28493,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Editar tienda de bicicletas" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermercado" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Editar supermercado" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Farmacia" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Editar farmacia" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Tienda de alimentación" @@ -28510,9 +28522,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Editar tienda de alimentación" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Kiosco" @@ -28520,27 +28532,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Editar kiosco" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Librería" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Editar librería" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Agencia de viajes" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Editar agencia de viajes" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Carnicería" @@ -28548,9 +28560,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Editar carnicería" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Panadería" @@ -28558,9 +28570,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Editar panadería" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Floristería" @@ -28568,18 +28580,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Editar floristería" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Tienda de productos orgánicos" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Editar tienda de productos orgánicos" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Tienda de bebidas alcohólicas" @@ -28587,54 +28599,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Editar tienda de bebidas alcohólicas" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Bebidas" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Editar tienda de bebidas" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Tienda de informática" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Editar tienda de informática" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Electrónica" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Editar tienda de electrónica" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hi-Fi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Editar tienda Hi-Fi" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Muebles" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Editar mueblería" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Centro de jardinería" @@ -28642,9 +28654,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Editar centro de jardinería" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Ferretería" @@ -28652,9 +28664,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Editar ferretería" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Almacén de bricolaje" @@ -28662,54 +28674,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Editar almacén de bricolaje" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Papelería" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Editar papelería" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Peluquería" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Editar peluquería" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Zapatos" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Editar zapatería" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Juguetes" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Editar juguetería" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Video" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Editar tienda de videos" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Tintorería" @@ -28717,9 +28729,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Editar tintorería" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Lavandería" @@ -28727,9 +28739,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Editar lavandería" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Tienda de actividades al aire libre" @@ -28737,24 +28749,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Editar tienda de actividades al aire libre" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Editar tienda de material de deportes" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Óptica" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Editar óptica" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Máquina expendedora" @@ -28762,5 +28774,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Editar máquina expendedora" @@ -28768,97 +28780,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Expendedor automático de productos" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "billetes de de transporte público" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "abonos de transporte público" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "billetes de aparcamiento" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "Alimentación" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "Bebidas" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "Caramelos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "Estanco" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "fotos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "comida para animales" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "Periódicos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "juguetes" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "sellos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "Tarjetas SIM" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "Tarjetas telefónicas" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "Bonos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "condones" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tampones" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "Bolsas para excrementos" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "Tarjetas de fidelización o descuento" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Dinero en efectivo" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Banco" @@ -28866,14 +28878,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Editar banco" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Cajero automático" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Cambio de moneda" @@ -28881,5 +28893,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Editar cambio de moneda" @@ -28887,15 +28899,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Editar cajero automático" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Centro médico" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "" @@ -28904,18 +28916,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Editar médicos" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Dentista" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Editar dentista" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Farmacia/Parafarmacia" @@ -28923,5 +28935,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Editar farmacia/parafarmacia" @@ -28929,9 +28941,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Expende con receta médica" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Hospital" @@ -28939,10 +28951,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Editar hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Punto de acceso para emergencias" @@ -28951,5 +28963,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Editar punto de acceso para emergencias" @@ -28958,20 +28970,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Número de punto" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Nombre del Punto" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Número de teléfono" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Utilizar código internacional, como +12-345-67890)" @@ -28979,5 +28991,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Veterinario" @@ -28986,64 +28998,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Editar veterinario" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Geografía" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Lugares" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Continente" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Editar continente" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "País" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Editar país" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Estado/Provincia" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Editar estado/provincia" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Región" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Editar región" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Municipio" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Editar municipio" @@ -29051,15 +29063,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Ciudad (>100.000 hab.)" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Editar ciudad (>100.00 hab.)" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Ciudad (10.000 - 100.000 hab.)" @@ -29067,10 +29079,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Editar ciudad (10.000 - 100.000 hab.)" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "" @@ -29080,5 +29092,5 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "" @@ -29087,15 +29099,15 @@ #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Población (< 10.000 hab.)" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Editar población (< 10.000 hab.)" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "" @@ -29103,5 +29115,5 @@ #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "" @@ -29111,5 +29123,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Paraje" @@ -29117,10 +29129,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Editar paraje" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Isla" @@ -29128,10 +29140,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Editar isla" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Islote" @@ -29139,5 +29151,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Editar islote" @@ -29145,5 +29157,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Entrada de cueva" @@ -29151,10 +29163,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Editar entrada de cueva" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Pico" @@ -29162,10 +29174,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Editar pico" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Glaciar" @@ -29173,10 +29185,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Editar glaciar" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Volcán" @@ -29184,70 +29196,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Editar volcán" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Fronteras" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Nacional" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Editar frontera nacional" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Administrativa" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Editar frontera administrativa" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Civil" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Editar frontera civil" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Político" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Editar frontera política" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Parque Nacional" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Editar límites del parque nacional" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Uso del suelo" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Árbol" @@ -29256,15 +29268,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Editar árbol" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Nombre botánico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Bosque" @@ -29273,5 +29285,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Editar bosque" @@ -29279,17 +29291,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "conífera" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "caducifolio" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "mixto" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Plantación forestal" @@ -29298,14 +29310,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Editar zona forestal" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Reserva natural" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Editar reserva natural" @@ -29313,25 +29325,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Pedregal" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Editar pedregal" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Matorral" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Editar matorral" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Braña" @@ -29339,10 +29351,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Editar braña" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Brezal o landa" @@ -29350,5 +29362,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Editar brezal o landa" @@ -29356,5 +29368,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Edificio agrario" @@ -29363,45 +29375,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Editar edificio agrario" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Tierra de labranza" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Editar tierra de labranza" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Prado" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Editar prado" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Viñedo" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Editar viñedo" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Huertos de ocio" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Editar zona de huertos de ocio" @@ -29409,15 +29421,15 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Jardín" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Editar jardín" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "" @@ -29426,10 +29438,10 @@ #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Editar zonas con hierba" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "" @@ -29439,10 +29451,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Editar parque municipal" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)" @@ -29450,20 +29462,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Editar espacio de uso común" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Parque" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Editar parque" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Área de esparcimiento" @@ -29471,5 +29483,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Editar área de esparcimiento" @@ -29477,15 +29489,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Área residencial" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Editar suelo residencial" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Camposanto (para los cementerios próximos a las iglesias)" @@ -29493,9 +29505,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Editar camposanto" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Cementerio" @@ -29503,39 +29515,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Editar cementerio" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Comercios" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Editar comercios" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Oficinas" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Editar oficinas" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Industrial" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Editar suelo industrial" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Zona ferroviaria" @@ -29543,15 +29555,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Editar zona ferroviaria" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Militar" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Editar área militar" @@ -29559,50 +29571,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Zona en construcción" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Editar zona en construcción" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Baldío" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Editar terreno baldío" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Suelo en construcción" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Editar suelo en contrucción" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Vertedero" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Editar vertedero" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Cantera" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Editar cantera" @@ -29612,5 +29624,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Editar multipolígono" @@ -29622,5 +29634,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "segmento exterior" @@ -29628,5 +29640,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "segmento interior" @@ -29634,5 +29646,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "Frontera" @@ -29643,5 +29655,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "Editar frontera" @@ -29649,36 +29661,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "Tipo de frontera" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "administrativa" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "Nivel administrativo" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -29686,5 +29698,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Restricción de giro" @@ -29693,5 +29705,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Editar restricción de giro" @@ -29699,34 +29711,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Restricción" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "prohibido girar a la izquierda" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "prohibido girar a la derecha" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "prohibido continuar recto" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "prohibido giro en U" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "solo giro a la derecha" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "solo giro a la izquierda" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "solo ir recto" @@ -29735,15 +29747,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "desde la vía" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "a través de nodo o vía" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "a la vía" @@ -29751,5 +29763,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Ruta" @@ -29758,5 +29770,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Editar ruta" @@ -29764,5 +29776,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Tipo de ruta" @@ -29870,5 +29882,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29879,17 +29891,17 @@ msgstr "bicicleta" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "carretera" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "ski" @@ -29957,5 +29969,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29965,9 +29977,9 @@ msgstr "pie" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "tranvía" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "desvío" @@ -29981,10 +29993,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Descripción del símbolo" @@ -29992,31 +30004,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Red" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "Ruta estatal" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "Propuesto" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "Suplente" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "temporal" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "Conexión" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Color (hex)" @@ -30025,30 +30037,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "segmento de la ruta" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "segmento siguiente" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "segmento anterior" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "punto de detención" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "próximo punto de parada" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "anterior punto de parada" @@ -30275,5 +30287,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "obsoleto" @@ -33601,11 +33613,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "lugar" @@ -33619,5 +33631,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "datos_TIGER" @@ -33972,4 +33984,123 @@ msgid "Sicily - Italy" msgstr "Sicilia - Italia" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "Ocurrió un error mientras se comunicaba con el " +#~ "servidor
Detalles: {0}" + +#~ msgid "Communication with server failed" +#~ msgstr "Comunicación fallida con el servidor" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Sí, deshacer el borrado de ellos también" + +#~ msgid "No, cancel operation" +#~ msgstr "No, calcelar la operación" + +#~ msgid "" +#~ "There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgid_plural "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" +#~ msgstr[0] "" +#~ "Hay {0} nodo adicional usado pur la vía {1}
que ha sido eliminada en " +#~ "el servidor.

¿Quiere que este nodo vuelva a existir?" +#~ msgstr[1] "" +#~ "Hay {0} nodos adicionales usados por la vía {1}
que ha sido eliminada " +#~ "en el servidor.

¿Quiere que estos nodos vuelvan a existir?" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "¿Deshacer el borrado de los nodos adicionales?" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "Hay {0} primitiva adicional referida en la relación a {1}
la cual está " +#~ "borrada en el servidor.

¿Desea recuperarla también?" +#~ msgstr[1] "" +#~ "Hay {0} primitivas adicionales referidas en la relación a {1}
las " +#~ "cuales están borradas en el servidor.

¿Desea recuperarlas también?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "¿Deshacer borrado de primitivos dependientes?" + +#~ msgid "Visible State:" +#~ msgstr "Estado visible:" + +#~ msgid "visible (on the server)" +#~ msgstr "visible (en el servidor)" + +#~ msgid "not visible (on the server)" +#~ msgstr "no visible (en el servidor)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Mantener un clon de la versión local" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Eliminar físicamente del conjunto de datos locales" + +#~ msgid "Keep my visible state" +#~ msgstr "Mantener mi estado visible" + +#~ msgid "Yes, reset the id" +#~ msgstr "Sí, reiniciar el id" + +#~ msgid "" +#~ "To keep your local version, JOSM
has to reset the id of " +#~ "primitive {0} to 0.
On the next upload the server will assign
it a " +#~ "new id.
Do you agree?" +#~ msgstr "" +#~ "Para mantener su versión local JOSM
tiene que restablecer la ID " +#~ "de la primitiva {0} a 0.
En la próxima subida el servidor le " +#~ "asignará
una ID nueva.
¿Está de acuerdo?" + +#~ msgid "Reset id to 0" +#~ msgstr "Reiniciar el id a 0" + +#~ msgid "Keep their visible state" +#~ msgstr "Mantener su estado visible" + +#~ msgid "Yes, purge it" +#~ msgstr "Sí, purgarlo" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM borrará la primitiva local con id {0}
del dataset.
¿Está " +#~ "de acuerdo?" + +#~ msgid "Remove from dataset" +#~ msgstr "Eliminar desde el conjunto de datos" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Conflicto entre estado visibles sin decidir" + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "{0} conflicto sigue sin resolverse.

Por favor, abra el cuadro " +#~ "de dialogo de Conflictos y resuélvalo manualmente." +#~ msgstr[1] "" +#~ "{0} conflicto2 siguen sin resolverse.

Por favor, abra el cuadro " +#~ "de dialogo de Conflictos y resuélvalos manualmente." + +#~ msgid "football" +#~ msgstr "fútbol" + +#~ msgid "Football" +#~ msgstr "Fútbol americano" #~ msgid "Move" Index: /applications/editors/josm/i18n/po/et.po =================================================================== --- /applications/editors/josm/i18n/po/et.po (revision 22208) +++ /applications/editors/josm/i18n/po/et.po (revision 22209) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-23 22:24+0000\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-28 16:19+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Estonian \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:06+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -241,5 +241,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -247,6 +247,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -332,8 +332,7 @@ msgstr "Sihtkihte ei ole" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Lisa märkus..." @@ -655,5 +654,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1036,5 +1035,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1043,5 +1042,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1181,4 +1180,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "" @@ -1452,6 +1452,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1671,6 +1671,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2297,5 +2295,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2528,10 +2526,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Otsi..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Otsi objekte." @@ -2539,65 +2537,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Palun sisesta otsingu tekst" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "asenda valik" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "lisa valikusse" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "eemalda valikust" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "tõstutundlik" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "regulaaravaldis" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2605,38 +2603,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2644,5 +2642,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2650,5 +2648,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2656,5 +2654,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2662,9 +2660,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2672,39 +2670,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2712,12 +2710,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2726,38 +2724,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Otsi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Alusta otsingut" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "regulaaravaldis" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2765,5 +2776,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2771,5 +2782,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2777,5 +2788,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2783,5 +2794,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2902,8 +2913,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3042,5 +3053,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3164,11 +3175,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3177,5 +3188,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3184,5 +3195,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3220,5 +3231,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3527,6 +3538,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3536,10 +3547,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3547,5 +3558,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3554,5 +3565,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3560,78 +3571,4 @@ #, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -3763,5 +3700,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "taust" @@ -3931,5 +3868,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "" @@ -3950,7 +3887,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4017,7 +3954,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "" @@ -4106,5 +4043,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4327,5 +4264,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4624,12 +4561,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4640,6 +4577,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4647,6 +4584,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4654,9 +4591,9 @@ msgstr "Liikmed" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4665,5 +4602,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4672,26 +4609,26 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4699,25 +4636,25 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "" @@ -4763,5 +4700,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "" @@ -4772,5 +4709,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4784,5 +4721,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "" @@ -4851,5 +4788,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4861,5 +4798,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "" @@ -4958,60 +4895,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5019,123 +4905,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" msgstr "" @@ -5283,5 +5104,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "kõik" @@ -5361,7 +5182,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5371,6 +5192,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5556,5 +5377,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5611,25 +5432,25 @@ "Pane valitud elemendid kaardil ülal asuvasse valitud objektide nimekirja." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5641,22 +5462,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5669,43 +5490,122 @@ msgstr "Lisa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 +msgid "Enable filter" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 +msgid "Hide elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 -msgid "Enable filter" +msgid "Inverse filter" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 -msgid "Hide elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 -msgid "Inverse filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 msgid "Filter mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Ekspordi GPX fail" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5748,37 +5648,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Lisa koordinaadid uuele sõlmele." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Kasuta kraade kümnendsüsteemis." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negatiivsed väärtused märgivad lääne/lõunapoolkera." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Palun sisesta sobiv laiuskraad vahemikus -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Palun sisesta laiuskraad vahemikus -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Palun sisesta sobiv pikkuskraad vahemikus -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Palun sisesta pikkuskraad vahemikus -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Sulge dialoog ja loo uus sõlm" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Sule dialoog, ära loo uut sõlme" @@ -5838,5 +5738,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Seosed" @@ -5884,10 +5784,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -5951,14 +5851,14 @@ msgstr "Valik: Relatsioonid:{0} / Teed:{1} / Punktid:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Valik: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6660,8 +6560,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6686,6 +6594,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7068,69 +6974,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Nimi" @@ -7708,5 +7615,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8344,8 +8251,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "" @@ -8374,6 +8281,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "tundmatu" @@ -8694,5 +8601,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "" @@ -9210,4 +9117,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9707,5 +9615,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "" @@ -9756,5 +9664,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -9827,23 +9735,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Andmekiht {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9852,34 +9760,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -9888,32 +9773,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -12821,4 +12706,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14268,5 +14154,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14535,5 +14421,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "" @@ -14967,36 +14853,36 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Hulknurk" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "aadress" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Loo uus seos" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Ehitised" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +msgid "Next no" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Aadressid" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15150,10 +15036,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15208,7 +15098,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15217,13 +15107,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15271,32 +15161,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "aadress" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15308,18 +15198,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15327,5 +15217,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15333,130 +15223,134 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15757,5 +15651,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -15764,14 +15658,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "" @@ -17029,4 +16923,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17067,9 +16980,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -18569,5 +18477,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "" @@ -18753,5 +18661,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Hulknurk" @@ -19268,5 +19176,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "" @@ -19309,34 +19217,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Andmeid pole" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -20269,7 +20180,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Faili avamine." +msgstr "" #. Strings in JFileChooser @@ -20551,7 +20461,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20560,10 +20477,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20572,5 +20489,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20579,15 +20496,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20597,10 +20514,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20609,5 +20526,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20616,5 +20533,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20623,10 +20540,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20635,5 +20552,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20643,5 +20560,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20650,15 +20567,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20667,5 +20584,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -20798,5 +20715,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "" @@ -21335,5 +21252,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "" @@ -21346,5 +21263,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "mets" @@ -21649,8 +21566,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "" @@ -21761,8 +21678,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "" @@ -22068,5 +21985,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "" @@ -22186,5 +22103,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "matkamine" @@ -22332,4 +22249,9 @@ #: build/trans_presets.java:633 msgid "Edit Motorway Junction" +msgstr "" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" msgstr "" @@ -22383,13 +22305,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operaatorfirma" @@ -22657,6 +22579,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "" @@ -23508,5 +23430,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Pinge" @@ -23877,24 +23799,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Avatud" @@ -23961,23 +23883,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "" @@ -23991,23 +23913,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "" @@ -24021,23 +23943,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -24151,6 +24073,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "" @@ -24166,5 +24088,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "" @@ -24178,5 +24100,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "" @@ -24352,5 +24274,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "" @@ -24388,5 +24310,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "" @@ -24394,5 +24316,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "" @@ -24511,5 +24433,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Tuletorn" @@ -25248,5 +25170,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Sport" @@ -25321,5 +25243,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25433,12 +25403,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25505,12 +25467,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25524,12 +25478,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -25691,5 +25637,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "" @@ -25716,4 +25663,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "ameerika_jalgpall" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "" @@ -25738,4 +25691,10 @@ msgid "bowls" msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "ameerika_jalgpall" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -25781,5 +25740,6 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" +#, fuzzy +msgid "gaelic_football" msgstr "ameerika_jalgpall" @@ -25821,5 +25781,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +msgid "rugby_union" msgstr "" @@ -25940,6 +25905,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -25953,5 +25922,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -25973,4 +25941,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "tüüp" @@ -25994,6 +25964,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26006,5 +25980,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26026,4 +25999,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "" @@ -26046,4 +26021,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "" @@ -26066,4 +26043,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "" @@ -26086,4 +26065,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -26285,158 +26266,190 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "" - -#. item "Sport (Ball)/Football" +msgid "Australian Football" +msgstr "" + +#. item "Sport (Ball)/Australian Football" #: build/trans_presets.java:2071 -msgid "Edit Football" +msgid "Edit Australian Football" msgstr "" #: build/trans_presets.java:2076 -msgid "Australian Football" -msgstr "" - -#. item "Sport (Ball)/Australian Football" +msgid "American Football" +msgstr "" + +#. item "Sport (Ball)/American Football" #: build/trans_presets.java:2077 -msgid "Edit Australian Football" +msgid "Edit American Football" msgstr "" #: build/trans_presets.java:2082 +msgid "Canadian Football" +msgstr "" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +msgid "Edit Canadian Football" +msgstr "" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "ameerika_jalgpall" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Vali korvpall" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Vali ragbi" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Ragbi" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Vali ragbi" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Pesapall" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Vali pesapall" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Korvpall" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Vali korvpall" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "Golfiväljak" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Kriket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Vali kriket" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Ragbi" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Vali ragbi" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Laua tennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Vali laua tennis" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Vali tennis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Hoone" @@ -26444,5 +26457,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Avalik hoone" @@ -26450,10 +26463,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Raekoda" @@ -26461,10 +26474,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Vali raekoda" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Saatkond" @@ -26472,10 +26485,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Vali saatkond" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Kohtumaja" @@ -26484,10 +26497,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Vali kohtumaja" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Vangla" @@ -26496,10 +26509,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Vali vangla" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Politsei" @@ -26509,10 +26522,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Vali politsei" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Tuletõrjedepoo" @@ -26521,10 +26534,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Vali tuletõrjedepoo" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Postkontor" @@ -26532,5 +26545,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "" @@ -26538,15 +26551,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Lasteaed" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Vali lasteaed" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Kool" @@ -26554,10 +26567,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Vali kool" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Ülikool" @@ -26565,10 +26578,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Vali ülikool" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Kolledž" @@ -26576,5 +26589,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Vali kolledž" @@ -26582,5 +26595,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Kino" @@ -26589,10 +26602,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Vali kino" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Raamatukogu" @@ -26601,9 +26614,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Vali raamatukogu" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "" @@ -26611,10 +26624,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Teater" @@ -26623,10 +26636,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Vali teater" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Palvekoht" @@ -26636,5 +26649,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Vali palvekoht" @@ -26643,6 +26656,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Religioon" @@ -26651,66 +26664,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "budist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "kristlane" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "juudi" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "moslem" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zoroastrism (pärsia)" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Usutunnistus" @@ -26719,81 +26732,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglikaan" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "katoliku" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "evangeelne" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "jehoovatunnistajad" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "luterlane" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "metodist" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormoon" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "ortodoksne" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "nelipühalane" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "presbüterlane" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestantlik" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "kveeker" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "šiia" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Aadressid" @@ -26802,5 +26815,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Vali aadressi infot" @@ -26808,5 +26821,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Maja number" @@ -26814,25 +26827,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Maja nimi" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Linna nimi" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Posti kood" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Riigi kood" @@ -26841,5 +26854,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "" @@ -26847,61 +26860,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "paaritu" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "paaris" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Inimtekkeline" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Töökojad" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Vali töökojad" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Torn" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Vali torn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "" @@ -26909,25 +26922,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Veetorn" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Vali veetorn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Gaasimahuti" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Vali gaasimahuti" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Majakas" @@ -26935,10 +26948,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Vali majakas" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Tuuleveski" @@ -26946,10 +26959,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Vali tuuleveski" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Torustik" @@ -26958,41 +26971,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Vali torustik" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "gaas" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "õli" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "" @@ -27002,10 +27015,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Kraana" @@ -27013,5 +27026,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Vali kraana" @@ -27019,10 +27032,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Vali tuletorn" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Geodeetiline punkt" @@ -27030,10 +27043,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Vali ülevaatlus punkt" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "järelvalve" @@ -27041,23 +27054,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Vali järelvalve kaamera" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Elektri generaator" @@ -27067,35 +27080,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Vali elektri generaator" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "tuul" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "hüdro" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fosiil" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "tuuma" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "süsi" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "päikeseenergia" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Elektrijaam" @@ -27104,10 +27117,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Vali elektrijaam" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Elektrialajaam" @@ -27116,5 +27129,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Vali elektri alajaam" @@ -27122,10 +27135,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "" @@ -27136,23 +27149,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "" @@ -27161,74 +27174,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Joonetüüp" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "joon" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "üksik" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "topelt" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "kolmekordne" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Teenused" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Tualetid" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Märkus" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telefon" @@ -27237,5 +27250,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "" @@ -27243,5 +27256,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Mündid" @@ -27249,5 +27262,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Märkused" @@ -27255,5 +27268,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "" @@ -27261,5 +27274,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Deebetkaart" @@ -27267,15 +27280,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Krediitkaart" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Telefoni kaart" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Jäätmekäitlus" @@ -27284,5 +27297,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Muuda jäätmekäitlusjaam" @@ -27290,35 +27303,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Battareid" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Riided" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Klaas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Paber" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Vanaraud" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "" @@ -27326,5 +27339,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "" @@ -27333,31 +27346,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Materjal" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "kivi" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "plastikust" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Värv" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "must" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "pruun" @@ -27436,5 +27449,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27444,31 +27457,31 @@ msgstr "roheala" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "punane" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "sinine" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "hall" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "valge" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Jahikantsel" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Muuda jahiala" @@ -27477,30 +27490,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Kõrgus" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "madal" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "pool" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "täis" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Peida" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Lukusta" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Purskaev" @@ -27509,10 +27522,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Vali purskaev" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Joogi vesi" @@ -27521,10 +27534,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Vali joogivee asukoht" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "" @@ -27533,5 +27546,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "" @@ -27539,5 +27552,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "" @@ -27545,15 +27558,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Poed" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "" @@ -27561,10 +27574,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "" @@ -27573,28 +27586,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Vali Supermarket" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Nurgakauplus" @@ -27602,9 +27615,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Vali nurgakauplus" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Kiosk" @@ -27612,27 +27625,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Vali kiosk" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Lihunik" @@ -27640,9 +27653,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Vali lihunik" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Pagar" @@ -27650,9 +27663,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Vali pagar" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Lilleseadja" @@ -27660,18 +27673,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Vali lilleseadja" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Ökokaubad" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Redigeeri ökopoodi" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Alkohol" @@ -27679,54 +27692,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Redigeeri alkoholi poode" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Joogipood" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Arvuti" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Vali arvutipood" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Elektroonika" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Vali elektroonika pood" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Mööbel" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Vali mööblipood" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Aiakeskus" @@ -27734,9 +27747,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Vali aiakeskus" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Riistvara" @@ -27744,9 +27757,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Vali riistvara pood" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "" @@ -27754,54 +27767,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Kirjatarbed" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Vali kirjatarvete pood" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Juuksur" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Vali juuksur" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Jalatsid" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Vali jalatsi pood" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Mänguasjad" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Vali mänguasja pood" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Video" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Vali video pood" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Kuiir puhastus" @@ -27809,9 +27822,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Vali kiirpuhastus" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Pesumaja" @@ -27819,9 +27832,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Vali pesumaja" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Välisuks" @@ -27829,24 +27842,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Vali välisukse pood" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Vali spordi pood" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Optik" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Vali optika" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "" @@ -27854,5 +27867,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "" @@ -27860,97 +27873,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "ühistranspordi_piletid" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "ühistranspordi_plaanid" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "parkimis_pilet" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "toit" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "joogid" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "maiustused" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "suitsud" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "fotod" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "looma_toit" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "ajalehed" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "mänguasjad" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "templid" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-kaardid" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "telefoni_kaardid" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "kondoomid" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tampoonid" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Sularaha" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Pank" @@ -27958,14 +27971,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Vali Pank" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Sularaha automaat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Rahavahetus" @@ -27973,5 +27986,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Vali rahavahetuse punkt" @@ -27979,15 +27992,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Vali sularaha automaat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Tervis" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Arstid" @@ -27995,18 +28008,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Vali arstid" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Hambaarst" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Vali hambaarst" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Apteek" @@ -28014,5 +28027,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Vali Apteek" @@ -28020,9 +28033,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Retseptuur" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Haigla" @@ -28030,10 +28043,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Vali haigla" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Hädaabi tugijaam" @@ -28042,5 +28055,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Vali hädaabi tugijaam" @@ -28049,20 +28062,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Punkti number" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Punkti nimi" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Telefoninumber" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -28070,5 +28083,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Loomaarst" @@ -28077,64 +28090,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Vali loomaarst" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Geograafia" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Asukohad" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Vali kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Maa" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Vali maa" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Riik" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Vali riik" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Regioon" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Vali regioon" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Maakond" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Vali maakond" @@ -28142,15 +28155,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Linn" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Vali linn" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Linn" @@ -28158,10 +28171,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Muuda linna" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Linnaosa" @@ -28169,25 +28182,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Muuda linnaosa" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Küla/Alevik/Alev" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Muuda küla/alevik/alev" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Küla" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Muuda küla" @@ -28195,5 +28208,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Asustamata koht" @@ -28201,10 +28214,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Muuda asustamata kohta" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Saar" @@ -28212,10 +28225,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Muuda saart" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "" @@ -28223,5 +28236,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "" @@ -28229,5 +28242,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Koobas" @@ -28235,10 +28248,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Muuda koobast" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Mäetipp" @@ -28246,10 +28259,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Muuda mäetippu" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Liustik" @@ -28257,10 +28270,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Muuda liustikku" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Vulkaan" @@ -28268,70 +28281,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Muuda vulkaani" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Piirid" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Riiklikud" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Muuda riiklikke piire" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Administratiivpiir" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Muuda administratiivpiire" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Omavalitsus" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Muuda omavalitsuse piire" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Valimisringkond" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Muuda valimisringkonda" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Rahvuspark" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Muuda rahvuspargi piire" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Maakasutus" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Üksik puu" @@ -28340,15 +28353,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Muuda puud" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Botaaniline nimi" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Mets" @@ -28357,5 +28370,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Muuda metsa" @@ -28363,17 +28376,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "okasmets" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "lehtmets" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "segamets" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Kultuurmets" @@ -28382,14 +28395,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Muuda kultuurmetsa" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Looduskaitseala" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Muuda looduskaitseala" @@ -28397,25 +28410,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "klibu, rusukalle" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Muuda rusukallet" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Võsa" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Muuda võsa" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Langus" @@ -28423,10 +28436,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Muuda langust" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Nõmm" @@ -28434,5 +28447,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Muuda nõmme" @@ -28440,5 +28453,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Taluõu" @@ -28447,45 +28460,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Muuda taluõue" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Talumaa" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Muuda talumaad" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Niit/Karjamaa" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Muuta niitu" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Viinapuuistandus" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Muuda viinapuuistandust" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Eraldised" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Muuda eraldisi" @@ -28493,25 +28506,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Aed" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Muuda aeda" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Muru" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Muuda muru" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Külatanum" @@ -28519,10 +28532,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Muuda külatanumat" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Avalik maa" @@ -28530,20 +28543,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Muuda avalikku maad" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Muuda parki" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Puhkeala" @@ -28551,5 +28564,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Muuda puhkeala" @@ -28557,15 +28570,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Elamurajoon" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Muuda elamurajooni" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Matmispaik" @@ -28573,9 +28586,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Muuda matmispaika" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Kalmistu" @@ -28583,39 +28596,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Muuda kalmistut" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Kaubandus" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Muuda kaubandust" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Kommerts" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Muuda kommertspiirkonda" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Tööstus" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Muuda tööstuspiirkonda" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Raudtee" @@ -28623,15 +28636,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Muuda raudteed" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Militaarala" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Muuda militaarala" @@ -28639,50 +28652,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Ehitustanner" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Muuda ehitustandrit" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Jäätmaa" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Muuda jäätmaad" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Roheala" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Muuda roheala" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Prügimägi" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Muuda prügimäge" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Kivimurd" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Muuda kivimurdu" @@ -28692,5 +28705,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Muuda hulknurka" @@ -28702,5 +28715,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "väline osa" @@ -28708,5 +28721,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "siseosa" @@ -28714,5 +28727,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -28723,5 +28736,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -28729,36 +28742,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -28766,5 +28779,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Pöördekeelud" @@ -28773,5 +28786,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Muuda pöördekeelde" @@ -28779,34 +28792,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Keelud" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "vasakpöörde keeld" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "parempöörde keeld" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "ei tohi otse sõita" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "ei tohi tagasi pöörata" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "ainult parempööre" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "ainult vaskpööre" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "ainult otsesõit" @@ -28815,15 +28828,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "teelt" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "üle sõlme või tee" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "teele" @@ -28831,5 +28844,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Teekond" @@ -28838,5 +28851,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Muuda teekonda" @@ -28844,5 +28857,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "teekonna tüüp" @@ -28950,5 +28963,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -28959,17 +28972,17 @@ msgstr "jalgrattaga" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "buss" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "tee" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "praam" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "suusad" @@ -29037,5 +29050,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29045,9 +29058,9 @@ msgstr "jalgsi" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "tramm" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "ümbersõit" @@ -29061,10 +29074,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "metroo" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "sümboolne kirjeldus" @@ -29072,31 +29085,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Võrk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "planeeritud" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "täiendav" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "ajutine" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "ühendus" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Värv (hex)" @@ -29105,30 +29118,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "teekonna osa" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "edasisuunaline osa" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "tagasisuunaline osa" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "peatuspunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "edasisuunaline peatuspunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "tagasisuunaline peatuspunkt" @@ -29355,5 +29368,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "kasutusest väljas" @@ -32681,11 +32694,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "koht" @@ -32699,5 +32712,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" Index: /applications/editors/josm/i18n/po/eu.po =================================================================== --- /applications/editors/josm/i18n/po/eu.po (revision 22208) +++ /applications/editors/josm/i18n/po/eu.po (revision 22209) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-28 14:44+0000\n" -"Last-Translator: Gari Araolaza \n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-29 22:24+0000\n" +"Last-Translator: Mikel Lizarralde \n" "Language-Team: Basque \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:50+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -247,5 +247,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -253,6 +253,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -340,8 +340,7 @@ msgstr "Helburu geruzarik ez" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Nodoa gehitu..." @@ -664,5 +663,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -966,5 +965,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 msgid "Fix relations" -msgstr "Harremanak konpondu" +msgstr "Erlazioak konpondu" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 @@ -1052,5 +1051,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1059,5 +1058,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1198,4 +1197,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Mugi ezazu nodoa..." @@ -1499,6 +1499,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1721,6 +1721,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2376,5 +2374,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2625,10 +2623,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Bilatu..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Objektuak bilatu." @@ -2636,49 +2634,49 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Mesedez, sar ezazu irazgazki katea." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Mesedez, sar ezazu bilaketa kate bat." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Sar ezazu bilatu nahi duzun adierazpidea" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "aukeraketa ordeztu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "gehitu aukeraketara" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "ezabatu aukeraketatik" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "aukeraketa bat bilatu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "Maiuskula/minuskula" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "objektu guztiak" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "Sartu bukatugabeko eta ezabatutako objektuak bilaketan." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "adierazpen erregularra" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" @@ -2686,18 +2684,18 @@ "izenetan." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" "Kale Nagusia - ''Kale Nagusia'' edozein tekla, giltza edo izenetan." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "izena:Nag - ''Nag'' izenaren edozein tokitan." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - ''type'' klabea eta ''route'' balioa dituztenak." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2707,21 +2705,21 @@ "*=balioa, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - ez ''Bak'' izenean." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "zentzu bakarrekoa? - oneway=yes, true, 1 edo on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - giltza=foot duen edozein baliorekin." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Helburu bereziak:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2730,9 +2728,9 @@ "b>)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "erabiltzailea:... - objektu guztiak erabiltzaileak aldatu ditu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" @@ -2740,9 +2738,9 @@ "aldatu ditu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - ID ezaguna duten objektuak (0 objektu berrientzat)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2752,5 +2750,5 @@ "bertsiorik gabe)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2760,5 +2758,5 @@ "objektu aldaketa multzorik gabe)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2768,5 +2766,5 @@ "nodoak:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2776,9 +2774,9 @@ "edo etiketak:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "rol:... - erlazio batean rol jakina duen objektua" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2788,21 +2786,21 @@ "(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "aldaturik - aldatu diren objektu guztiak" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "aukeratuak - aukeraturiko objektu guztiak" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "osatu gabea - osatu gabeko objektu guztiak" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "etiketarik gabe - etiketarik gabeko objektu guztiak" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2811,5 +2809,5 @@ "guztien kumeak" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2818,9 +2816,9 @@ "guztien gurasoak" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "Erabili | edo OR logikarekin bat egiteko edo" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2828,5 +2826,5 @@ "baldin badauka)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2837,12 +2835,12 @@ "b>)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Erabili ( eta ) adierazpen multzoetarako" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2851,38 +2849,51 @@ msgstr "Iragazkia" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Bilatu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Iragazkia gehitu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Bilaketa hasi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Sar ezazu bilatu nahi duzun adierazpidea" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Ez da ezer aurkitu ''{0}'' bilaketarentzat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Ez da ezer gehitu aukeratutako gunera ''{0}'' hori bilatzeagatik" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Ez da ezer ezabatu aukeratutako gunetik ''{0}'' hori bilatzeagatik" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Aukeratutako gunean ez da ezer aurkitu ''{0}'' hori bilatzeagatik" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2890,5 +2901,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2896,5 +2907,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2902,5 +2913,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2908,5 +2919,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -3047,8 +3058,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3192,5 +3203,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3320,11 +3331,11 @@ msgstr[1] "Mugitu {0} nodoak" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "''{0}'' objektua ezabatua" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3333,5 +3344,5 @@ msgstr[1] "''{0}'' objektuak ezabatuak" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3342,5 +3353,5 @@ "(e)koa da" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3378,5 +3389,5 @@ msgstr "{1} erlazioaren etiketatuan {0} gatazkak konpondu" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3718,6 +3729,6 @@ "de . Hau ez da errore garrantzitsu bat, beraz zure lanean jarrai dezakezu." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3727,10 +3738,10 @@ msgstr "Galdu egin da {0} ID-a duen bidearen ageriko helburua" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Galdu egin da {0} ID-a duen objektuaren ageriko helburua" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3738,5 +3749,5 @@ msgstr "Galdu egin da {0} ID-a duen nodoaren ageriko helburua" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3745,5 +3756,5 @@ msgstr "Galdu egin da {0} ID-a duen erlazioaren ageriko helburua" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3752,80 +3763,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "Galdu egin da {1} ID-a duen {0} motako ageriko helburua" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "E" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "H" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Testua" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "R" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "A" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "D" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "F" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

Iragazkia aktibatuta dago

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} objektuak ezkutaturik" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "

{0} objektuak desgaiturik" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "" -"

Objektu guztiak ikusi ahal izateko itxi ezazu elkarrizketa-iragazkia." -"

" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3896,6 +3831,6 @@ msgid "relation" msgid_plural "relations" -msgstr[0] "harreman" -msgstr[1] "harremanak" +msgstr[0] "erlazio" +msgstr[1] "erlazioak" #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587 @@ -3965,5 +3900,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "hondoa" @@ -4088,15 +4023,13 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29 msgid "Guyane RGFG95" -msgstr "" +msgstr "Frantziar Guyana RGFG95" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (Frantzia)" +msgstr "UTM Frantzia (DOM)" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "UTM20 Ipar Sistema Geodesikoa" +msgstr "UTM Sistema-geodesikoa" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4139,5 +4072,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "trenbidea" @@ -4158,7 +4091,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4225,7 +4158,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "eraikina" @@ -4314,5 +4247,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4547,5 +4480,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4858,12 +4791,12 @@ msgstr "{0} rola ez dago konparatzen ari garen bikotean: {1}." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Propietateak" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4874,6 +4807,6 @@ msgstr "Etiketak" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4881,6 +4814,6 @@ msgstr "Nodoak" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4888,9 +4821,9 @@ msgstr "Kideak" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Ez dago konpondu beharreko etiketa gatazkarik" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4899,5 +4832,5 @@ msgstr[1] "Etiketak ({0} gatazka)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4906,9 +4839,9 @@ msgstr[1] "{0} etiketa gatazka konpontzeke" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Nodoak (konponduta)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4917,17 +4850,17 @@ "konpontzeko gatazkarik." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Nodoak (gatazkekin)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Bide honetako nodo zerrendan gatazkak daude oraindik" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Kideak (konponduta)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4937,25 +4870,25 @@ "gatazkarik" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Kideak (gatazkekin)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Erlazio honen kideen arteko konpondu gabeko gatazkak" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Ez dago propietateen gatazkarik" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Propietateak (gatazkekin)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Konpondu beharreko propietateen gatazkak" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Gatazkaren konponbidea" @@ -5003,5 +4936,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Nire bertsioa" @@ -5012,5 +4945,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -5026,5 +4959,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Beraien bertsioa" @@ -5103,5 +5036,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -5113,5 +5046,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Behera" @@ -5216,62 +5149,9 @@ "eraiki." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" -"Errore bat gertatu da zerbitzariarekin komunikatzerakoan
Detaileak: " -"{0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Zerbitzariarekin komunikazioak huts egin du" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Bai, berreskuratu horiek ere bai" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "Ez, utzi eragiketa" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5279,123 +5159,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Koordenatuak:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Ezabatutako egoera:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Ikusgai egoera:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +msgstr "Noren erreferentzia:" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(bat ere ez)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "ezabatua" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "ezabatu gabe" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "ikusgai (zerbitzarian)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "ezkutuan (zerbitzarian)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Bertsio lokalaren klon bat mantendu" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Fisikoki ezabatu datu talde lokaletik" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Gorde nire koordinatuak" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Gorde beraien koordinatuak" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Bai, garbitu." - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Ezabatu datu taldetik" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" msgstr "" @@ -5501,29 +5316,29 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:131 msgid "Conflicts when combining primitives" -msgstr "" +msgstr "Jatorrizkoak konbinatzean gatazka" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:135 #, java-format msgid "Conflicts when combining ways - combined way is ''{0}''" -msgstr "" +msgstr "Bideak konbinatzean gatazkak - konbinatutako bidea \"{0}\" da" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:140 #, java-format msgid "Conflicts when merging nodes - target node is ''{0}''" -msgstr "" +msgstr "Nodoak bateratzean gatazkak - helburu-nodoa \"{0}\" da" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:282 msgid "No conflicts to resolve" -msgstr "" +msgstr "Ez dago konpondu beharreko gatazkarik" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273 msgid "Cancel conflict resolution" -msgstr "" +msgstr "Gatazka-konponketa desegin" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288 msgid "Apply resolved conflicts" -msgstr "" +msgstr "Kopondutako gatazkak ezarri" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360 @@ -5544,5 +5359,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "denak" @@ -5622,7 +5437,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5632,6 +5447,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5697,5 +5512,5 @@ #: build/specialmessages.java:77 msgid "Value:" -msgstr "" +msgstr "Balioa:" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111 @@ -5730,9 +5545,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51 msgid "Orig. Way" -msgstr "" +msgstr "Jatorrizko bidea" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59 msgid "Decision" -msgstr "" +msgstr "Erabakia" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:43 @@ -5742,13 +5557,13 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48 msgid "Show tags with conflicts only" -msgstr "" +msgstr "Gatazkak dituzten etiketak soilik erakutsi" #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:49 msgid "Show tags with multiple values only" -msgstr "" +msgstr "Balio-anitzak diren etiketak soilik erakutsi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161 msgid "For selected objects only" -msgstr "" +msgstr "Aukeratutako objektuentzat soilik" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162 @@ -5762,5 +5577,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128 msgid "Changesets" -msgstr "" +msgstr "Aldaketa-multzoa" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:255 @@ -5789,9 +5604,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:190 msgid "Show info" -msgstr "" +msgstr "Erakutsi informazioa" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:417 msgid "Open a web page for each selected changeset" -msgstr "" +msgstr "Aldaketa-multzo bakoitzarentzako web-orri bana ireki" #. Strings in JFileChooser @@ -5799,5 +5614,5 @@ #: build/specialmessages.java:28 msgid "Details" -msgstr "" +msgstr "Xehetasunak" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:457 @@ -5809,5 +5624,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:236 msgid "Command Stack" -msgstr "" +msgstr "Komando-sorta" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:74 @@ -5817,5 +5632,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5832,5 +5647,5 @@ #, java-format msgid "Toggle: {0}" -msgstr "" +msgstr "Trukatu: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:314 @@ -5849,5 +5664,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114 msgid "Resolve conflicts." -msgstr "" +msgstr "Gatazkak konpondu." #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 @@ -5858,5 +5673,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Resolve" -msgstr "" +msgstr "Konpondu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 @@ -5871,25 +5686,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 +msgid "Close anyway" +msgstr "Itxi edonola ere" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 msgid "Continue resolving" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +msgstr "Jarraitu konpontzen" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5901,22 +5716,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +msgstr "Gatazka ez da guztiz konpondu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +msgstr "Gatazkak konpondu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +msgstr "Gatazkak konpondu \"{0}\"(r)entzat" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5927,46 +5742,127 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74 msgid "Add" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +msgstr "Gehitu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +msgstr "Iragazkia gehitu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +msgstr "Iragazkia editatu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +msgstr "Iragazkia ezabatu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +msgstr "Iragazkia igo" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." -msgstr "" +msgstr "Iragazkia jaitsi" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 +msgid "Enable filter" +msgstr "Iragazkia aktibatu" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 +msgid "Hide elements" +msgstr "Elementuak ezkutatu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 -msgid "Enable filter" -msgstr "" +msgid "Inverse filter" +msgstr "Iragazkia alderantzikatu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 -msgid "Hide elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 -msgid "Inverse filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 msgid "Filter mode" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +msgstr "Iragazki-modua" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Fitxategia kargatzean errorea" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "E" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "H" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Testua" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "R" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "A" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "D" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

Iragazkia aktibatuta dago

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} objektuak ezkutaturik" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "

{0} objektuak desgaiturik" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "" +"

Objektu guztiak ikusi ahal izateko itxi ezazu elkarrizketa-iragazkia." +"

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -5974,5 +5870,5 @@ #: ../plugins/reverter/src/reverter/ReverterPlugin.java:18 msgid "History" -msgstr "" +msgstr "Historia" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -5982,5 +5878,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:265 msgid "Object with history" -msgstr "" +msgstr "Historiadun objektua" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 @@ -5998,47 +5894,47 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:322 msgid "Show" -msgstr "" +msgstr "Erakutsi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:323 msgid "Display the history of the selected objects." -msgstr "" +msgstr "Aukeratutako objektuen historia erakutsi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java:43 msgid "Advanced object info" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +msgstr "Objektuen informazio aurreratua" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Sartu nodo berriarentzako koordenatuak." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Erabili gradu hamartarrak" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Balio negatiboek Mendebaldeko/Hegoaldeko hemisferioa adierazten dute." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Mesedez, sar ezazu baliogarria den latitude bat -90..90 tartean" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Mesedez, sar ezazu -90..90 tartean dagoen latitude bat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Mesedez, sar ezazu baliogarria den longitude bat -180..180 tartean" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Mesedez, sar ezazu -180..180 tartean dagoen longitude bat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Itxi elkarrizketa-leihoa eta sortu nodo berria" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Itxi elkarrizketa-leihoa, ez sortu nodo berririk" @@ -6047,17 +5943,17 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 msgid "Layers" -msgstr "" +msgstr "Geruzak" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155 msgid "Open a list of all loaded layers." -msgstr "" +msgstr "Kargatutako geruzen zerrenda ireki" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275 msgid "Delete the selected layers." -msgstr "" +msgstr "Aukeratutako geruzak ezabatu." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336 msgid "Show/Hide" -msgstr "" +msgstr "Erakutsi/Ezabatu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347 @@ -6068,9 +5964,9 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:507 msgid "Activate" -msgstr "" +msgstr "Aktibatu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388 msgid "Activate the selected layer" -msgstr "" +msgstr "Aukeratutako geruzak aktibatu." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 @@ -6080,17 +5976,17 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504 msgid "Duplicate this layer" -msgstr "" +msgstr "Geruza hau bikoiztu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601 msgid "Move the selected layer one row up." -msgstr "" +msgstr "Aukeratutako geruza lerro bat gorantz mugitu." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620 msgid "Move the selected layer one row down." -msgstr "" +msgstr "Aukeratutako geruza lerro bat beherantz mugitu." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33 msgid "Information about layer" -msgstr "" +msgstr "Geruzari buruzko informazioa" #. item "Land use/Quarry" text "Name" @@ -6098,28 +5994,28 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" -msgstr "" +msgstr "Erlazioak" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90 msgid "Open a list of all relations." -msgstr "" +msgstr "Erlazio guztien zerrenda ireki." #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:279 msgid "Open an editor for the selected relation" -msgstr "" +msgstr "Aukeratutako erlazioarentzat editore bat ireki" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:320 msgid "Delete the selected relation" -msgstr "" +msgstr "Aukeratutako erlazioa ezabatu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:358 msgid "Create a new relation" -msgstr "" +msgstr "Erlazio berria sortu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1373 msgid "Create a copy of this relation and open it in another editor window" -msgstr "" +msgstr "Erlazio honen kopia bat sortu eta beste edizio-leiho batean ireki" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:433 @@ -6144,10 +6040,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -6156,5 +6052,5 @@ #, java-format msgid "Relations: {0}" -msgstr "" +msgstr "Erlazioak: {0}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:166 @@ -6204,5 +6100,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67 msgid "Selection" -msgstr "" +msgstr "Aukeraketa" #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:508 @@ -6211,14 +6107,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +msgstr "Aukeraketa: {0}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6241,9 +6137,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:143 msgid "Authors" -msgstr "" +msgstr "Egileak" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65 msgid "Open a list of people working on the selected objects." msgstr "" +"Aukeratutako objektuan lanean ibili diren pertsona guztien zerrenda ireki." #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141 @@ -6251,6 +6148,6 @@ msgid "{0} Author" msgid_plural "{0} Authors" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Egile {0}" +msgstr[1] "{0} egile" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:160 @@ -6281,13 +6178,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278 msgid "" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:291 msgid "Author" -msgstr "" +msgstr "Egilea" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:291 msgid "# Objects" -msgstr "" +msgstr "Objektu kopurua" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:179 @@ -6301,5 +6198,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:182 msgid "Content" -msgstr "" +msgstr "Edukia" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183 @@ -6342,5 +6239,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:323 msgid "Update changeset" -msgstr "" +msgstr "Aldaketa-multzoa eguneratu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450 @@ -6358,5 +6255,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:510 msgid "My changesets" -msgstr "" +msgstr "Nire aldaketa-multzoa" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:512 @@ -6374,5 +6271,5 @@ msgctxt "changeset.upload-comment" msgid "empty" -msgstr "" +msgstr "hutsik" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62 @@ -6380,5 +6277,5 @@ msgctxt "changeset.state" msgid "Open" -msgstr "" +msgstr "Ireki" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64 @@ -6386,5 +6283,5 @@ msgctxt "changeset.state" msgid "Closed" -msgstr "" +msgstr "Itxita" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73 @@ -6392,9 +6289,9 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155 msgid "anonymous" -msgstr "" +msgstr "anonimoa" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:30 msgid "Comment" -msgstr "" +msgstr "Iruzkina" #. Strings in JFileChooser @@ -6402,18 +6299,18 @@ #: build/specialmessages.java:51 msgid "Open" -msgstr "" +msgstr "Ireki" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54 msgid "User" -msgstr "" +msgstr "Erabiltzailea" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:54 msgid "Created at" -msgstr "" +msgstr "Sorketa data" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:62 msgid "Closed at" -msgstr "" +msgstr "Itxiera data" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:69 @@ -6440,5 +6337,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:306 msgid "Download content" -msgstr "" +msgstr "Edukia jaitsi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:178 @@ -6452,5 +6349,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:310 msgid "Update content" -msgstr "" +msgstr "Edukia eguneratu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:201 @@ -6462,5 +6359,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241 msgid "Show history" -msgstr "" +msgstr "Historia erakutsi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250 @@ -6514,5 +6411,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464 msgid "Download now" -msgstr "" +msgstr "Orain jaitsi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465 @@ -6522,17 +6419,17 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:50 msgid "Created" -msgstr "" +msgstr "Sortua" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:51 msgid "Updated" -msgstr "" +msgstr "Eguneratua" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:52 msgid "Deleted" -msgstr "" +msgstr "Ezabatua" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:32 msgid "ID" -msgstr "" +msgstr "IDa" #. Strings in JFileChooser @@ -6919,8 +6816,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6945,6 +6850,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7327,95 +7230,96 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" -msgstr "" +msgstr "Izena" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:115 msgid "ID:" -msgstr "" +msgstr "IDa:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:128 msgid "Comment:" -msgstr "" +msgstr "Iruzkina:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:143 msgid "Open/Closed:" -msgstr "" +msgstr "Irekia/Itxita:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:155 msgid "Created by:" -msgstr "" +msgstr "Sortzailea:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:168 msgid "Created on:" -msgstr "" +msgstr "Sorrera-data:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:180 msgid "Closed on:" -msgstr "" +msgstr "Itxiera-data:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:267 @@ -7460,17 +7364,17 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 msgid "open" -msgstr "" +msgstr "ireki" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41 msgid "closed" -msgstr "" +msgstr "itxita" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:45 msgid "Changeset ID: " -msgstr "" +msgstr "Aldaketa-multzoaren IDa: " #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47 msgid "Enter a changeset id" -msgstr "" +msgstr "Eman aldaketa-multzoaren IDa" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79 @@ -7522,9 +7426,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389 msgid "User ID:" -msgstr "" +msgstr "Erabiltzaile IDa:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409 msgid "User name:" -msgstr "" +msgstr "Erabiltzaile izena:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445 @@ -7558,5 +7462,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553 msgid "Please enter a valid user ID" -msgstr "" +msgstr "Balizko erabiltzaile ID bat eman" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554 @@ -7570,9 +7474,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564 msgid "Invalid user name" -msgstr "" +msgstr "Baliogabeko erabiltzaile izena" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656 msgid "Date: " -msgstr "" +msgstr "Data: " #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684 @@ -7583,5 +7487,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720 msgid "Date:" -msgstr "" +msgstr "Data:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714 @@ -7661,5 +7565,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108 msgid "Download my changesets only" -msgstr "" +msgstr "Nire aldaketa-multzoa soilik jaitsi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109 @@ -7712,5 +7616,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:133 msgid "Basic" -msgstr "" +msgstr "Oinarrizkoa" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52 @@ -7730,5 +7634,5 @@ #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137 msgid "Advanced" -msgstr "" +msgstr "Aurreratua" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58 @@ -7771,5 +7675,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42 msgid "URL: " -msgstr "" +msgstr "URL-a: " #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70 @@ -7779,5 +7683,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71 msgid "Examples" -msgstr "" +msgstr "Adibideak" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76 @@ -7794,5 +7698,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:164 msgid "Add Properties" -msgstr "" +msgstr "Propietateak gehitu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:196 @@ -7800,6 +7704,6 @@ msgid "This will change {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Horrela objektu {0} aldatuko da." +msgstr[1] "Horrela {0} objekturaino aldatuko dira." #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:198 @@ -7814,10 +7718,10 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115 msgid "" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:261 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:402 msgid "Change values?" -msgstr "" +msgstr "Balioak aldatu?" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:321 @@ -7832,6 +7736,6 @@ msgid "This will change up to {0} object." msgid_plural "This will change up to {0} objects." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Horrela objektu {0} aldatuko da." +msgstr[1] "Horrela {0} objekturaino aldatuko dira." #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:362 @@ -7841,44 +7745,44 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:387 msgid "Please select a value" -msgstr "" +msgstr "Mesedez, aukeratu balio bat" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:482 msgid "Please select the objects you want to change properties for." -msgstr "" +msgstr "Mesedez, aukeratu propietateak editatzea nahi dizkiezun objektuak." #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:534 msgid "Properties/Memberships" -msgstr "" +msgstr "Propietateak/Partaidetzak" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:533 msgid "Properties for selected objects." -msgstr "" +msgstr "Aukeratutako objektuen propietateak" #. setting up the membership table #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:567 msgid "Member Of" -msgstr "" +msgstr "Partaidea" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:567 msgid "Position" -msgstr "" +msgstr "Kokapena" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:940 #, java-format msgid "Properties: {0} / Memberships: {1}" -msgstr "" +msgstr "Propietateak: {0} / Partaidetzak: {1}" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943 msgid "Properties / Memberships" -msgstr "" +msgstr "Propietateak / Partaidetzak" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:996 msgid "Change relation" -msgstr "" +msgstr "Erlazioa aldatu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 msgid "Delete from relation" -msgstr "" +msgstr "Erlaziotik ezabatu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:999 @@ -7893,5 +7797,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1022 msgid "Delete Properties" -msgstr "" +msgstr "Propietateak ezabatu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1053 @@ -7905,5 +7809,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1101 msgid "Select relation" -msgstr "" +msgstr "Erlazioa aukeratu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1102 @@ -7925,5 +7829,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241 msgid "Download selected relations" -msgstr "" +msgstr "Aukeratutako erlazioak jaitsi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245 @@ -7945,6 +7849,6 @@ msgid "Conflict in data" msgid_plural "Conflicts in data" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Datuetan gatazka" +msgstr[1] "Datuetan gatazkak" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:344 @@ -7957,5 +7861,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353 msgid "Relation is deleted" -msgstr "" +msgstr "Erlazioa ezabatu egin da" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:401 @@ -7963,9 +7867,9 @@ #, java-format msgid "Downloading relation {0}" -msgstr "" +msgstr "{0} erlazioa jaisten" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -7989,5 +7893,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 msgid "Download relations" -msgstr "" +msgstr "Erlazioak jaitsi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 @@ -7998,10 +7902,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149 msgid "Tags and Members" -msgstr "" +msgstr "Etiketak eta partaideak" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159 msgid "Parent Relations" -msgstr "" +msgstr "Guraso-erlazioak" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 @@ -8107,5 +8011,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 msgid "Sort" -msgstr "" +msgstr "Ordenatu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 @@ -8119,5 +8023,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 msgid "Reverse" -msgstr "" +msgstr "Alderantzikatu" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 @@ -8372,5 +8276,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110 msgid "Bookmarks" -msgstr "" +msgstr "Laster-markak" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152 @@ -8409,5 +8313,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217 msgid "Remove the currently selected bookmarks" -msgstr "" +msgstr "Ezabatu aukeratutako laster-markak" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242 @@ -8467,5 +8371,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:97 msgid "Data Sources and Types:" -msgstr "" +msgstr "Dato jatorri eta motak" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98 @@ -8487,5 +8391,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:133 msgid "Download as new layer" -msgstr "" +msgstr "Geruza berri bezala deskargatu" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:134 @@ -8505,5 +8409,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225 msgid "Download area ok, size probably acceptable to server" -msgstr "" +msgstr "Deskargatzeko azalera egokia, ziurrenez zerbitzariak onartuko du" #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:378 @@ -8558,5 +8462,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148 msgid "Areas around places" -msgstr "" +msgstr "Tokien inguruko eremua" #. SAXException does not chain correctly @@ -8602,8 +8506,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "" @@ -8632,6 +8536,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "" @@ -8639,5 +8543,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:37 msgid "Slippy map" -msgstr "" +msgstr "Mapa irristakorra" #: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:37 @@ -8952,5 +8856,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Gatazkak aurkitu dira" @@ -9470,4 +9374,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9967,5 +9872,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "" @@ -10014,5 +9919,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10085,23 +9990,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10110,34 +10015,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10146,32 +10028,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -11909,5 +11791,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:315 msgid "Please restart JOSM to activate the downloaded plugins." -msgstr "" +msgstr "Mesedez, jaitsitako gehigarri guztiak aktibatzeko berrabiarazi JOSM" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:331 @@ -12226,5 +12108,5 @@ #, java-format msgid "Author: {0}" -msgstr "" +msgstr "Egilea: {0}" #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:430 @@ -12768,6 +12650,6 @@ msgid "Change {0} object" msgid_plural "Change {0} objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Aldatu {0} objektua" +msgstr[1] "Aldatu {0} objektuak" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:903 @@ -12786,5 +12668,5 @@ #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:116 msgid "Change Properties" -msgstr "" +msgstr "Aldatu propietateak" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25 @@ -12835,5 +12717,5 @@ #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32 msgid "Contacting OSM Server..." -msgstr "" +msgstr "OSM zerbitzariarekin konektatzen..." #: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47 @@ -13012,5 +12894,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77 msgid "Add author information" -msgstr "" +msgstr "Egileari buruzko informazioa gehitu" #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80 @@ -13075,4 +12957,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -13958,5 +13841,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194 msgid "Click to update the activated plugins" -msgstr "" +msgstr "Egin klik aktibatutako gehigarriak eguneratzeko" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198 @@ -14522,5 +14405,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14782,5 +14665,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "" @@ -15187,5 +15070,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44 msgid "Buildings width:" -msgstr "" +msgstr "Eraikinen zabalera:" #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:45 @@ -15200,5 +15083,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 msgid "Draw buildings" -msgstr "" +msgstr "Eraikinak marraztu" #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379 @@ -15214,35 +15097,36 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Multipoligonoa" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "Helbideak" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -msgid "Create house number and street name relation" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" -msgstr "" - -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Zenbakia" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +msgstr "Eraikinak" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +msgid "Next no" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Helbideak" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15396,10 +15280,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15454,7 +15342,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15463,13 +15351,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15517,32 +15405,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15554,18 +15442,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15573,5 +15461,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15579,130 +15467,134 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15728,5 +15620,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:166 msgid "Create buildings" -msgstr "" +msgstr "Eraikinak sortu" #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:271 @@ -15978,5 +15870,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:193 msgid "Blank Layer" -msgstr "" +msgstr "Geruza garbia" #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245 @@ -16003,5 +15895,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -16010,14 +15902,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "" @@ -16025,17 +15917,17 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72 msgid "Use" -msgstr "" +msgstr "Erabili" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:76 msgid "Please select a scheme to use." -msgstr "" +msgstr "Aukeratu erabiltzeko eskema bat" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:86 msgid "Color Scheme" -msgstr "" +msgstr "Kolore-eskema" #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:100 msgid "Please select the scheme to delete." -msgstr "" +msgstr "Aukeratu ezabatzeko eskema bat" #. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help.")); @@ -16055,10 +15947,10 @@ #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:127 msgid "Color Schemes" -msgstr "" +msgstr "Kolore-eskemak" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43 msgid "Split area" -msgstr "" +msgstr "Azalera banandu" #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41 @@ -16834,9 +16726,9 @@ #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:22 msgid "Convert to multipolygon" -msgstr "" +msgstr "Multipoligono bilakatu" #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:39 msgid "Convert to multipolygon." -msgstr "" +msgstr "Multipoligono bilakatu." #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:81 @@ -16852,9 +16744,9 @@ #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:21 msgid "Create multipolygon" -msgstr "" +msgstr "Multipoligonoa sortu" #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49 msgid "Create multipolygon." -msgstr "" +msgstr "Multipoligonoa sortu." #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:120 @@ -17273,4 +17165,23 @@ #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41 msgid "Drag to scale the picture in the Y Axis" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" msgstr "" @@ -17313,9 +17224,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -17337,5 +17243,5 @@ #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28 msgid "create new objects" -msgstr "" +msgstr "objektu berriak sortu" #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29 @@ -17438,5 +17344,5 @@ #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16 msgid "Objects history" -msgstr "" +msgstr "Objektuen historia" #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:15 @@ -17518,5 +17424,5 @@ #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28 msgid "Edit relations" -msgstr "" +msgstr "Erlazioak editatu" #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:73 @@ -17564,5 +17470,5 @@ #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68 msgid "Open a list of routing nodes" -msgstr "" +msgstr "Nodo-ibilgarrien zerrenda ireki." #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79 @@ -17625,5 +17531,5 @@ #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 msgid "Slippy Map" -msgstr "" +msgstr "Mapa irristakorra" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150 @@ -18815,5 +18721,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "" @@ -18999,7 +18905,7 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" -msgstr "" +msgstr "Multipoligonoa" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:50 @@ -19123,5 +19029,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:45 msgid "This plugin checks for errors in relations." -msgstr "" +msgstr "Gehigarri honek erlazioetako arazoak egiaztatzen ditu" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/RelationChecker.java:115 @@ -19283,25 +19189,27 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:572 msgid "Presets do not contain property value" -msgstr "" +msgstr "Lehenetsien artean ez dago balio egokirik" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:584 msgid "FIXMES" -msgstr "" +msgstr "FIXMES" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:627 msgid "Check property keys." -msgstr "" +msgstr "Ezaugarriaren giltzak egiaztatu." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628 msgid "Validate that property keys are valid checking against list of words." msgstr "" +"Ezaugarriaren giltzak zuzenak direla balioztatu hitz-zerrenda erabiliz." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635 msgid "Use complex property checker." -msgstr "" +msgstr "Ezaugarrien balioztatzaile konplexua erabili." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636 msgid "Validate property values and tags using complex rules." msgstr "" +"Ezaugarrien balioak eta etiketak balioztatu erregela konplexuak erabiliz." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657 @@ -19311,5 +19219,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697 msgid "TagChecker source" -msgstr "" +msgstr "Etiketen balioztatze iturria" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720 @@ -19321,41 +19229,42 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721 msgid "Add a new source to the list." -msgstr "" +msgstr "Iturri berria gehitu zerrendara" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722 msgid "Edit the selected source." -msgstr "" +msgstr "Aukeratutako iturria editatu." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:723 msgid "Delete the selected source from the list." -msgstr "" +msgstr "Aukeratutako iturria ezabatu zerrendatik." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725 msgid "Data sources" -msgstr "" +msgstr "Datu-iturriak" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745 msgid "Check property values." -msgstr "" +msgstr "Ezaugarrien balioak egiaztatu." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746 msgid "Validate that property values are valid checking against presets." -msgstr "" +msgstr "Egiaztatu ezaugarrien balioak egokiak direla lehenetsitakoak aztertuz" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753 msgid "Check for FIXMES." -msgstr "" +msgstr "FIXMESak aztertu." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754 msgid "Looks for nodes or ways with FIXME in any property value." msgstr "" +"Bilatu edozein ezaugarriren balioan FIXMEak dauzkaten nodo edota bideak" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:761 msgid "Use default data file." -msgstr "" +msgstr "Lehenetsitako datu-fitxategia erabili" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:762 msgid "Use the default data file (recommended)." -msgstr "" +msgstr "Lehenetsitako datu-fitxategia erabili (gomendatua)." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:765 @@ -19369,21 +19278,21 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:769 msgid "Use default spellcheck file." -msgstr "" +msgstr "Lehenetsitako zuzentzaile-ortografikoa erabili." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:770 msgid "Use the default spellcheck file (recommended)." -msgstr "" +msgstr "Lehenetsitako zuzentzaile-ortografikoa erabili (gomendatua)." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:862 msgid "Fix properties" -msgstr "" +msgstr "Propietateak konpondu" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977 msgid "Could not find element type" -msgstr "" +msgstr "Ezin izan da elementu mota aurkitu" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:979 msgid "Incorrect number of parameters" -msgstr "" +msgstr "Parametro kopuru okerra" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:997 @@ -19460,49 +19369,51 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:35 msgid "Unclosed Ways." -msgstr "" +msgstr "Itxi gabeko bideak." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:35 msgid "This tests if ways which should be circular are closed." msgstr "" +"Test honen bidez itxita egon beharko liratekeen bide zirkularrak egiaztatzen " +"dira." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:77 #, java-format msgid "natural type {0}" -msgstr "" +msgstr "{0} mota naturala" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:80 #, java-format msgid "landuse type {0}" -msgstr "" +msgstr "{0} lur-erabilpen mota" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:83 #, java-format msgid "amenities type {0}" -msgstr "" +msgstr "{0} zerbitzu mota" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:86 #, java-format msgid "sport type {0}" -msgstr "" +msgstr "{0} kirol mota" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:89 #, java-format msgid "tourism type {0}" -msgstr "" +msgstr "{0} turismo mota" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:92 #, java-format msgid "shop type {0}" -msgstr "" +msgstr "{0} denda mota" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:95 #, java-format msgid "leisure type {0}" -msgstr "" +msgstr "{0} aisialdi mota" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:98 #, java-format msgid "waterway type {0}" -msgstr "" +msgstr "{0} ubide mota" #. color building @@ -19514,5 +19425,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "azalera" @@ -19559,34 +19470,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Oharrak" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19594,26 +19508,27 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:62 msgid "Untagged, empty and one node ways." -msgstr "" +msgstr "Etiketa gabeko, hutsik dauden edota nodo-bakarreko bideak." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:63 msgid "This test checks for untagged, empty and one node ways." msgstr "" +"Test honek etiketa gabeko, hutsik dauden edota nodo-bakarreko bideak " +"egiaztatzen ditu." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94 msgid "Unnamed ways" -msgstr "" +msgstr "Izenik gabeko bideak" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:96 msgid "Unnamed junction" -msgstr "" +msgstr "Izenik gabeko bidegurutzeak" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Etiketa eta konexio gabeko nodoak" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 msgid "Untagged ways" -msgstr "" +msgstr "Etiketa gabeko bideak" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:111 @@ -19836,4 +19751,6 @@ msgid "Could not find a unique node to start downloading from." msgstr "" +"Ezin ezin da jaitsiera abiaraziko duen nodo bakar bat ere aurkitu." #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:119 @@ -19929,5 +19846,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151 msgid "Add Rectified Image" -msgstr "" +msgstr "Zuzendutako irudia gehitu" #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:201 @@ -20434,7 +20351,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:23 -#, fuzzy msgid "Abort file chooser dialog" -msgstr "Fitxategi-aukeraketa koadroa bertan behera utzi." +msgstr "" #. Strings in JFileChooser @@ -20546,7 +20462,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Ireki aukeratutako fitxategia." +msgstr "" #. Strings in JFileChooser @@ -20848,7 +20763,14 @@ msgstr "Aldaketa-multzoak" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20860,10 +20782,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Bideratzaile-gaitasunak ematen ditu" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20875,5 +20797,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20884,10 +20806,10 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Egungo GPS kokapenean markak/nodoak gehitzeko aukera ematen digu." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" @@ -20896,5 +20818,5 @@ #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20908,10 +20830,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "Bloke bakanetatik elkar-atxikitako etxeak sortzen ditu" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20922,5 +20844,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20931,5 +20853,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20940,5 +20862,5 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" @@ -20947,5 +20869,5 @@ #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20957,5 +20879,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20968,5 +20890,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20978,15 +20900,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "Elkar-konektaturiko bide luzeen deskarga erraza" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "Aukeratu adarkadura ez dute konektaturiko bideak" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20997,5 +20919,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21130,5 +21052,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Erreferentzia" @@ -21667,5 +21589,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "metala" @@ -21678,5 +21600,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "egurra" @@ -21981,8 +21903,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "bai" @@ -22093,8 +22015,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "ez" @@ -22400,5 +22322,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "zerbitzu-bidea" @@ -22518,5 +22440,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "xenda" @@ -22665,4 +22587,9 @@ msgid "Edit Motorway Junction" msgstr "Autobideko irteera editatu" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Zenbakia" #. item "Waypoints/Motorway Junction" text "Number" @@ -22715,13 +22642,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operadorea" @@ -22989,6 +22916,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Garaiera" @@ -23840,5 +23767,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Tentsioa" @@ -24209,24 +24136,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Irekiera-ordutegia" @@ -24293,23 +24220,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24/7" @@ -24323,23 +24250,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "Astelehenetik ostiralera 08:30-20:00" @@ -24353,23 +24280,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Asteartetik Igandera 08:00-15:00; Larunbatetan 08:00-12:00" @@ -24483,6 +24410,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Erreferentzia zenbakia" @@ -24498,5 +24425,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "lurrazpian" @@ -24510,5 +24437,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Ordainpekoa" @@ -24684,5 +24611,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Gurpildun aulkia" @@ -24720,5 +24647,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Babeslekua" @@ -24726,5 +24653,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Jarlekua" @@ -24843,5 +24770,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Baliza" @@ -25580,5 +25507,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Kirolak" @@ -25653,5 +25580,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25765,12 +25740,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25837,12 +25804,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25856,12 +25815,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -26023,5 +25974,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "kirola" @@ -26048,4 +26000,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "futbol australiarra" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "futbol australiarra" @@ -26073,4 +26031,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "futbol australiarra" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "piragua" @@ -26113,6 +26077,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "futbola" +#, fuzzy +msgid "gaelic_football" +msgstr "futbol australiarra" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26153,5 +26118,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "errugbia" @@ -26272,6 +26243,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26285,5 +26260,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26305,4 +26279,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "mota" @@ -26326,6 +26302,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26338,5 +26318,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26358,4 +26337,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "zelaia" @@ -26378,4 +26359,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "kiroldegia" @@ -26398,4 +26381,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "estadioa" @@ -26418,4 +26403,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "pista" @@ -26617,158 +26604,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Futbol amerikarra" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Futbol amerikarra editatu" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Futbol australiarra" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Futbol australiarra editatu" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Futbol australiarra" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Futbol australiarra editatu" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Futbol amerikarra editatu" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Futbol australiarra editatu" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Futbol amerikarra editatu" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Futbol amerikarra editatu" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Rugby-a editatu" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby-a" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Rugby-a editatu" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Beisbola" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Beisbola editatu" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Saskibaloia" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Saskibaloia editatu" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golfa" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Golfa editatu" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "golf-zelaia" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Boulea" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Boulea editatu" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Bola-jokoa" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Bola-jokoa editatu" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Cricket-a" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Cricket-a editatu" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Saredun-cricket-a" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Saredun-cricket-a editatu" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Croquet-a" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Croquet-a editatu" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hockey-a" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Hockey-a editatu" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Frontoia (Euskal pilota)" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Frontoia (Euskal pilota) editatu" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Erraketa" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Erraketa editatu" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby-a" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Rugby-a editatu" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Ping-pong" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Ping-pong-a editatu" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tenis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Tenisa editatu" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Gizakiak-eraikia" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Eraikina" @@ -26776,5 +26799,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Eraikin-publikoa" @@ -26782,10 +26805,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Eraikin-publikoa editatu" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Udaletxea" @@ -26793,10 +26816,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Udaletxea editatu" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Enbaxada" @@ -26804,10 +26827,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Enbaxada editatu" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Epaitegia" @@ -26816,10 +26839,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Epaitegia editatu" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Gartzela" @@ -26828,10 +26851,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Gartzela editatu" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Polizia" @@ -26841,10 +26864,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Polizia editatu" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Suhiltzaile-etxea" @@ -26853,10 +26876,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Suhiltzaile-etxea editatu" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Postetxea" @@ -26864,5 +26887,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Postetxea-editatu" @@ -26870,15 +26893,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Haurreskola" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Haurreskola editatu" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Eskola" @@ -26886,10 +26909,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Eskola editatu" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Unibertsitatea" @@ -26897,10 +26920,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Unibertsitatea editatu" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Batxilergo-eskola" @@ -26908,5 +26931,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Batxilergo-eskola editatu" @@ -26914,5 +26937,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Zinema" @@ -26921,10 +26944,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Zinema editatu" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Liburutegia" @@ -26933,9 +26956,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Liburutegia editatu" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Arte zentrua" @@ -26943,10 +26966,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Arte zentrua editatu" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Antzokia" @@ -26955,10 +26978,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Antzokia editatu" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Gurtze-lekua" @@ -26968,5 +26991,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Gurtze-lekua editatu" @@ -26975,6 +26998,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Erlijioa" @@ -26983,66 +27006,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "bahaista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "budista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "kristaua" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hindua" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "jainista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "judu" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "musulman" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sij" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "espiritualista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "unitarismo" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zoroastrika" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Sinesmena" @@ -27051,81 +27074,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglikano" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptista" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "katoliko" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "ebanjeliko" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "Jehovaren lekukoak" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "luterano" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "metodista" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormoi" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "ortodoxo" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "pentekostal" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "presbiteriano" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestante" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "kuakero" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "xii" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "suni" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Helbideak" @@ -27134,5 +27157,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Helbideak editatu" @@ -27140,5 +27163,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Eraikinaren atari zenbakia" @@ -27146,25 +27169,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Eraikinaren izena" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Kale-izena" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Hiriaren izena" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Posta-kodea" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Estatuaren kodea" @@ -27173,5 +27196,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Helbideen Interpolazioa editatu" @@ -27179,61 +27202,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Zenbakien-eskema" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "bakoitia" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "bikoitia" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "alfabetiko" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Gizakiak eraikia" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Lantokia" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Lantokia editatu" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Dorrea" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Dorrea editatu" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "Dorre mota" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "komunikazioa" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "behaketa" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Altuera (metrotan)" @@ -27241,25 +27264,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Ur-dorrea" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Ur-dorrea editatu" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Gasometroa" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Gasometroa" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Itsasargia" @@ -27267,10 +27290,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Itsasargia editatu" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Haize-errota" @@ -27278,10 +27301,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Haize-errota editatu" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Hodiak" @@ -27290,41 +27313,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Hodiak editatu" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "gasa" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "termikoa" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "olioa" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "hondakin-ura" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "edozein substantzia" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Kokapena" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "urperatua" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "lurrazalean" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Hondakin-uren araztegia editatu" @@ -27334,10 +27357,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Hondakin-uren araztegia editatu" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Garabia" @@ -27345,5 +27368,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Garabia editatu" @@ -27351,10 +27374,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Baliza editatu" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Erpin geodesikoa" @@ -27362,10 +27385,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Erpin geodesikoa" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Zaintza-kamera" @@ -27373,23 +27396,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Zaintza-kamera editatu" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "barruko" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "kanpoko" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "publikoa" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Energia-sorgailua" @@ -27399,35 +27422,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Energia sorgailua editatu" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "haizea" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "hidrauliko" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fosil" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "nuklear" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "ikatza" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "fotovoltaiko" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Zentral elektrikoa" @@ -27436,10 +27459,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Zentral elektrikoa editatu" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Azpiestazio elektrikoa" @@ -27448,5 +27471,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Azpiestazio elektrikoa editatu" @@ -27454,10 +27477,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Linearen erreferentzia" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Elektrizitate-dorrea" @@ -27468,23 +27491,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Elektrizitate-dorrea editatu" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "dorrea" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "postea" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "Dorrearen erreferentzia" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Linea elektrikoa" @@ -27493,74 +27516,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Linea elektrikoa editatu" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Linea mota" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "Linea" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "behe-tentsioa" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Kable kopurua" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Alanbre kopurua (eroale hobea) kable elektriko bakoitzeko" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "bakuna" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "bikoitza" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "hirukoitza" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Zerbitzuak" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Komunak" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "mugatua" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Oharra" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Gutunontzia" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telefonoa" @@ -27569,5 +27592,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Telefonoa editatu" @@ -27575,5 +27598,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Txanponak" @@ -27581,5 +27604,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Oharrak" @@ -27587,5 +27610,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Errekarga-txartelak eta diru-zorro elektronikoak" @@ -27593,5 +27616,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Debitu-txartelak" @@ -27599,15 +27622,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Kreditu-txartelak" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Telefono-txartelak" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Birziklapena" @@ -27616,5 +27639,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Birziklatze-gunea editatu" @@ -27622,35 +27645,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Bateria" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Ontziak" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Arropak" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Beira" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Papera" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Txatarra" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "Paperontzia" @@ -27658,5 +27681,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Paperontzia editatu" @@ -27665,31 +27688,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "Aulkiaren bizkarraldea" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Materiala" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "harria" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "plastikoa" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Kolorea" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "beltza" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "marroia" @@ -27768,5 +27791,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27776,31 +27799,31 @@ msgstr "berdea" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "gorria" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "urdina" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "grisa" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "zuria" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Jarleku kopurua" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Ehiza-postua" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Ehiza-postua editatu" @@ -27809,30 +27832,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Garaiera" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "baxua" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "erdia" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "beteta" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Ezkutatu" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Esklusa" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Iturria" @@ -27841,10 +27864,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Iturria editatu" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Iturria (edateko ona)" @@ -27853,10 +27876,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Iturria (edateko ona) editatu" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Suteentzako hidrantea" @@ -27865,5 +27888,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Suteentzako hidrantea editatu" @@ -27871,5 +27894,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "" @@ -27877,15 +27900,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Dendak" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Auto kontzesionarioa" @@ -27893,10 +27916,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Auto kontzesionarioa editatu" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Bizikleta-denda" @@ -27905,28 +27928,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Bizikleta-denda editatu" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermerkatua" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Supermerkatua editatu" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Botika" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Botika editatu" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Janari-denda" @@ -27934,9 +27957,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Janari-denda editatu" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Kioskoa" @@ -27944,27 +27967,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Kioskoa editatu" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Liburudenda" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Liburudenda editatu" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Bidaia-agentzia" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Bidaia-agentzia editatu" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Harategia" @@ -27972,9 +27995,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Harategia editatu" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Okindegia" @@ -27982,9 +28005,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Okindegia editatu" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Loradenda" @@ -27992,18 +28015,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Loradenda editatu" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Produktu organikoen denda" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Produktu organikoen denda" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Alkohola" @@ -28011,54 +28034,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Alkoholdun edarien denda editatu" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Edariak" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Edari-denda editatu" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Ordenagailua" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Ordenagailu-denda editatu" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Elektronika" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Elektronika-denda editatu" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "HI-FI" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "HI-FI denda editatu" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Altzariak" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Altzari-denda editatu" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Lorezaintza zentrua" @@ -28066,9 +28089,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Lorezaintza zentrua editatu" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Burdindegia" @@ -28076,9 +28099,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Burdindegia editatu" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Brikolaje-denda" @@ -28086,54 +28109,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Brikolaje denda editatu" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Paper-denda" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Paper-denda editatu" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Ileapaindegia" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Ileapaindegia editatu" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Zapatak" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Zapata-denda editatu" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Jostailuak" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Jostailu-denda editatu" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Bideoa" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Bideo-denda editatu" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Tindategia" @@ -28141,9 +28164,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Tindategia editatu" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Garbitegia" @@ -28151,9 +28174,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Garbitegia editatu" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Kanpoko aktibitateen denda" @@ -28161,24 +28184,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Kanpoko aktibitateen denda editatu" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Kiroldenda editatu" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Optika" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Optika editatu" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Makina-saltzailea" @@ -28186,5 +28209,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Makina-saltzailea editatu" @@ -28192,97 +28215,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Produktuen makina-saltzailea" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "garraio publikoko txartelak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "garraio publikoaren mapak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "aparkalekuko txartelak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "Elikadura" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "edariak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "gozokiak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "zigarretak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "argazkiak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "animalientzako janaria" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "egunkariak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "jostailuak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "seiluak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM txartelak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "Telefono-txartelak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "Bonuak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "kondoiak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tanpoiak" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "gorotz-poltsa" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "Fideltasun edo deskontu txartelak" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Dirua" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Banku" @@ -28290,14 +28313,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Bankua editatu" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Kutxazain automatikoa" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Diru-trukea" @@ -28305,5 +28328,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Diru-trukea editatu" @@ -28311,15 +28334,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Kutxazain automatikoa editatu" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Osasuna" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Medikuak" @@ -28327,18 +28350,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Medikuak editatu" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Dentista" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Dentista editatu" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Botika" @@ -28346,5 +28369,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Botika editatu" @@ -28352,9 +28375,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Medikuaren errezetarekin saltzen dute" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Ospitalea" @@ -28362,10 +28385,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Ospitalea editatu" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Larrieldietarako sarrera puntua" @@ -28374,5 +28397,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Larrieldietarako sarrera puntua editatu" @@ -28381,20 +28404,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Puntu-zenbakia" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Puntuaren izena" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Telefono Zenbakia" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Erabili nazioarteko kodea, hala nola +12-345-67890)" @@ -28402,5 +28425,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Albaitaria" @@ -28409,64 +28432,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Albaitaria editatu" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Geografia" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Lekuak" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Kontinentea" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Kontinentea editatu" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Herrialdea" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Herrialdea editatu" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Estatua" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Estatua editatu" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Erregioa" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Erregioa editatu" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Eskualdea" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Eskualdea editatu" @@ -28474,15 +28497,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Hiria (100.000 biztanle baino gehiago)" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Hiria (100.000 biztanle baino gehiago) editatu" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Herria (10.000 - 100.000 biztanle)" @@ -28490,10 +28513,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Herria (10.000 - 100.000 biztanle) editatu" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Auzoa" @@ -28501,25 +28524,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Auzoa editatu" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Herria (10.000 biztale baino gutxiago)" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Herria (10.000 biztale baino gutxiago) editatu" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Auzoa (mendialdean eta egoten direnak)" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Auzoa (mendialdean eta egoten direnak) editatu" @@ -28527,5 +28550,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Ingurua (leku geografikoa)" @@ -28533,10 +28556,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Ingurua (leku geografikoa) editatu" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Irla" @@ -28544,10 +28567,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Irla editatu" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Irlatxoa" @@ -28555,5 +28578,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Irlatxoa editatu" @@ -28561,5 +28584,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Kobazuloaren sarrera" @@ -28567,10 +28590,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Kobazuloaren sarrera editatu" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Mendi-tontorra" @@ -28578,10 +28601,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Mendi-tontorra editatu" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Glaziarra" @@ -28589,10 +28612,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Glaziarra editatu" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Sumendia" @@ -28600,70 +28623,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Sumendia editatu" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Mugak" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Nazionala" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Muga nazionala editatu" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Administratiboa" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Muga administratiboa editatu" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Zibila" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Muga zibila editatu" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Politikoa" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Muga politikoa editatu" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Parke nazionala" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Parke nazionala editatu" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Lurzorua" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Zuhaitza" @@ -28672,15 +28695,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Zuhaitza editatu" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Izen-botanikoa" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Basoa" @@ -28689,5 +28712,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Basoa editatu" @@ -28695,17 +28718,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "konifero" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "hostoerorkorra" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "misto" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Basoa" @@ -28714,14 +28737,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Basoa editatu" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Natura-erreserba" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Natura-erreserba editatu" @@ -28729,25 +28752,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Harritza" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Harritza editatu" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Sastraka" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Sastraka editatu" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "" @@ -28755,10 +28778,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Txilardi" @@ -28766,5 +28789,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Txilardia editatu" @@ -28772,5 +28795,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Etxaldea" @@ -28779,45 +28802,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Etxalde-gunea editatu" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Nekazaritza-lurra" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Nekazaritza-lurrak editatu" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Belardia" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Belardia editatu" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Mahastia" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Mahastia editatu" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Soroak" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Soroak editatu" @@ -28825,25 +28848,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Lorategia" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Lorategia editatu" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Belarra" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Belardia editatu" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Udal-parkea" @@ -28851,10 +28874,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Udal-parkea editatu" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Amankomuna" @@ -28862,20 +28885,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Amankomuna editatu" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Parkea" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Parkea editatu" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Aisialdi-gunea" @@ -28883,5 +28906,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Aisialdi-gunea editatu" @@ -28889,15 +28912,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Bizitegi-gunea" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Bizitegi-gunea editatu" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Hilerria (txikia)" @@ -28905,9 +28928,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Hilerria (txikia) editatu" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Hilerria" @@ -28915,39 +28938,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Hilerria editatu" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Merkataritza" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Merkataritza-gunea editatu" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Bulegoak" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Bulego-eremua editatu" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Industriala" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Industrialdea editatu" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Trenbide-eremua" @@ -28955,15 +28978,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Trenbide-eremua editatu" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Militarra" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Eremu militarra editatu" @@ -28971,50 +28994,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Eraikitze-eremua" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Eraikitze-eremua editatu" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Lugorria" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Lugorria editatu" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Eraikitzeko lurzorua" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Eraikitzeko lurzorua editatu" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Zabortegia" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Editatu zabortegia" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Harrobia" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Harrobia editatu" @@ -29024,5 +29047,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Multipoligonoa editatu" @@ -29034,5 +29057,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "kanpoko segmentua" @@ -29040,5 +29063,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "barruko segmentua" @@ -29046,5 +29069,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "Muga" @@ -29055,5 +29078,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "Muga editatu" @@ -29061,36 +29084,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "Muga mota" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "administratiboa" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "nazionala" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "zibila" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "politikoa" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "Maila administratiboa" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "Azpi-area" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "Administrazio gunea" @@ -29098,5 +29121,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Biraketa debekua" @@ -29105,5 +29128,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Biraketa debekua editatu" @@ -29111,34 +29134,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Debekua" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "ezkerrera biratzea debekatua" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "eskuinera biratzea debekatua" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "zuzen jarraitzea debekatua" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "U biraketa egitea debekatua" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "soilik eskuinera biratzea" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "soilik ezkerrera biratzea" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "aurrerantz soilik" @@ -29147,15 +29170,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "norabide honetatik" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "nodo edo bide honetan zehar" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "bide honetara" @@ -29163,5 +29186,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Bidea" @@ -29170,5 +29193,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Bidea editatu" @@ -29176,5 +29199,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Bide mota" @@ -29282,5 +29305,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29291,17 +29314,17 @@ msgstr "bizikleta" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "autobusa" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "errepidea" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "ski" @@ -29369,5 +29392,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29377,9 +29400,9 @@ msgstr "oinezkoa" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "tranbia" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "desbideratzea" @@ -29393,10 +29416,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "metroa" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Sinboloaren deskribapena" @@ -29404,31 +29427,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Sarea" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "Estatuko bidea" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "proposatutako" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "txandakatu" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "behin-behineko" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "lotura" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Kolorea (hex)" @@ -29437,30 +29460,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "ibilbidearen segmentua" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "hurrengo segmentua" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "aurreko segmentua" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "geldialdi puntua" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "hurrengo geldialdi puntua" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "aurreko geldialdi puntua" @@ -29687,5 +29710,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "zaharkitua" @@ -33013,11 +33036,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "lekua" @@ -33031,5 +33054,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "TIGER_datuak" @@ -33384,2 +33407,51 @@ msgid "Sicily - Italy" msgstr "Sizilia - Italia" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "Errore bat gertatu da zerbitzariarekin " +#~ "komunikatzerakoan
Detaileak: {0}" + +#~ msgid "Communication with server failed" +#~ msgstr "Zerbitzariarekin komunikazioak huts egin du" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Bai, berreskuratu horiek ere bai" + +#~ msgid "No, cancel operation" +#~ msgstr "Ez, utzi eragiketa" + +#~ msgid "Visible State:" +#~ msgstr "Ikusgai egoera:" + +#~ msgid "visible (on the server)" +#~ msgstr "ikusgai (zerbitzarian)" + +#~ msgid "not visible (on the server)" +#~ msgstr "ezkutuan (zerbitzarian)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Bertsio lokalaren klon bat mantendu" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Fisikoki ezabatu datu talde lokaletik" + +#~ msgid "Yes, reset the id" +#~ msgstr "Bai, berrezarri IDa" + +#~ msgid "Reset id to 0" +#~ msgstr "IDa 0ra berrezarri" + +#~ msgid "Yes, purge it" +#~ msgstr "Bai, garbitu." + +#~ msgid "Remove from dataset" +#~ msgstr "Ezabatu datu taldetik" + +#~ msgid "football" +#~ msgstr "futbola" + +#~ msgid "Football" +#~ msgstr "Futbol amerikarra" Index: /applications/editors/josm/i18n/po/fi.po =================================================================== --- /applications/editors/josm/i18n/po/fi.po (revision 22208) +++ /applications/editors/josm/i18n/po/fi.po (revision 22209) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-23 21:52+0000\n" -"Last-Translator: Dirk Stöcker \n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-30 18:27+0000\n" +"Last-Translator: Mika Laari \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:55+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:08+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -243,5 +243,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -249,6 +249,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -336,8 +336,7 @@ msgstr "Ei kohdetasoja" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Lisää piste..." @@ -659,5 +658,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -785,5 +784,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:99 msgid "Invalid ID specified. Cannot download object." -msgstr "" +msgstr "Virheellinen tunnus. Kohdetta ei voi ladata." #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29 @@ -1040,5 +1039,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1047,5 +1046,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1055,5 +1054,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 msgid "Zoom (in metres)" -msgstr "" +msgstr "Mittakaava (metreissä)" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94 @@ -1073,8 +1072,10 @@ msgid "Could not parse Latitude, Longitude or Zoom. Please check." msgstr "" +"Leveysastetta, pituusastetta tai mittakaavaa ei kyetty tulkitsemaan. " +"Tarkista arvot." #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116 msgid "Unable to parse Lon/Lat" -msgstr "" +msgstr "Pituus- tai leveysastetta ei kyetty tulkitsemaan." #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 @@ -1184,4 +1185,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Siirrä piste..." @@ -1477,6 +1479,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1697,6 +1699,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2239,5 +2239,5 @@ #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:156 msgid "Click to abort and to resume editing" -msgstr "" +msgstr "Voit peruuttaa ja jatkaa muokkausta napsauttamalla." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162 @@ -2252,5 +2252,11 @@ "report a conflict." msgstr[0] "" +"Paikallisessa datajoukossa on {0} kohde, joka on saatettu poistaa " +"palvelimelta. Jos myöhemmin yrität poistaa tai päivittää kohteen, tulee " +"palvelin todennäköisesti ilmoittamaan ristiriidasta." msgstr[1] "" +"Paikallisessa datajoukossa on {0} kohdetta, jotka on saatettu poistaa " +"palvelimelta. Jos myöhemmin yrität poistaa tai päivittää näitä kohteita, " +"tulee palvelin todennäköisesti ilmoittamaan ristiriidasta." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:169 @@ -2261,19 +2267,23 @@ "Click {0} to check the state of these objects on the server." msgstr[0] "" +"Voit tarkistaa kohteen tilan palvelimelta napsauttamalla {0}." msgstr[1] "" +"Voit tarkistaa kohteiden tilan palvelimelta napsauttamalla {0}." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173 #, java-format msgid "Click {0} to ignore." -msgstr "" +msgstr "Ohita napsauttamalla {0}." #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:178 msgid "Deleted or moved objects" -msgstr "" +msgstr "Poistetut tai siirretyt kohteet" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:244 #, java-format msgid "The following errors occurred during mass download: {0}" -msgstr "" +msgstr "Massalatauksen aikana tapahtui seuraavat virheet: {0}" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:245 @@ -2330,5 +2340,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2358,5 +2368,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98 msgid "Mode: Draw Focus" -msgstr "" +msgstr "Tila: Piirrä" #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360 @@ -2416,5 +2426,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88 msgid "Extrude" -msgstr "" +msgstr "Ulonna" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87 @@ -2424,5 +2434,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388 msgid "Extrude Way" -msgstr "" +msgstr "Ulonna polkua" #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408 @@ -2446,5 +2456,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29 msgid "Drag play head" -msgstr "" +msgstr "Raahaa toistopäätä" #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82 @@ -2453,4 +2463,7 @@ "+release to synchronize audio at that point." msgstr "" +"Raahaamalla toistopään lähelle kulkujälkeä aletaan ääntä toistaa siitä " +"kohdasta. Jos painat vaihtonäppäintä päästöhetkellä, tahdistetaan ääniraita " +"kyseiseen pisteeseen." #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110 @@ -2474,6 +2487,6 @@ msgid "Add and move a virtual new node to way" msgid_plural "Add and move a virtual new node to {0} ways" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Lisää uusi virtuaalisolmu polkuun ja siirrä sitä" +msgstr[1] "Lisää uusi virtuaalisolmu {0} polkuun ja siirrä sitä" #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467 @@ -2543,44 +2556,44 @@ #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48 msgid "" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50 msgid "" -msgstr "" +msgstr "" #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51 msgid "" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +msgstr "" + #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Etsi..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Etsi kohteita." @@ -2588,49 +2601,49 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Kirjoita suodatuslauseke." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Kirjoita hakuehdot." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Kirjoita hakulauseke" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "korvaa valinta" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "lisää valintaan" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "poista valinnasta" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "etsi valinnasta" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "kirjainkoko merkitsee" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +msgstr "kaikki kohteet" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +msgstr "Etsi myös vaillinaisia ja poistettuja kohteita" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "säännöllinen lauseke" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" @@ -2638,5 +2651,5 @@ "tai arvossa" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" @@ -2644,13 +2657,13 @@ "arvossa" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Sörn - ''Sörn'' missä tahansa kohtaa arvoa" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - avaimen ''type'' arvo täsmälleen ''route''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2660,21 +2673,21 @@ "type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Sörn - ei merkkijonoa ''Sörn'' arvossa." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "oneway? - oneway=yes, true, 1 tai on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - avain foot asetettuna" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Erityisehdot:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2683,17 +2696,17 @@ "relation (relaatio))" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - annetun käyttäjän muokkaamat kohteet" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "user:anonymous - anonyymin käyttäjän muokkaamat kohteet" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - kohde, jolla on annettu tunniste (0 uusille kohteille)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2703,5 +2716,5 @@ "kohteilla 0)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2711,5 +2724,5 @@ "(kokoelmiin kuulumattomilla 0)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2719,5 +2732,5 @@ "nodes:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2727,9 +2740,9 @@ "tags:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +msgstr "rooli:... - kohde, jolla on tietty rooli jossain relaatiossa" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2739,21 +2752,21 @@ "12T14:51:09Z, 2009-11-12 tai T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - kaikki muokatut kohteet" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - kaikki valitut kohteet" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - kaikki keskeneräiset kohteet" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - kaikki tagittomat kohteet" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2762,5 +2775,5 @@ "lapsikohteet" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2768,9 +2781,9 @@ "parent ehdot - kaikki hakuehdot täyttävien kohteiden emokohteet" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "| tai OR yhdistää ehdot (looginen \"tai\"-lause)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2778,5 +2791,5 @@ "tekstejä (esim. : avaimessa)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2786,12 +2799,12 @@ "\\ (\\\" ja \\\\)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Voit ryhmitellä hakuehtoja suluilla ( and )." #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2800,38 +2813,51 @@ msgstr "Suodin" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Etsi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Toteuta suodin" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Aloita haku" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Kirjoita hakulauseke" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Hakusanalla \"{0}\" ei löytynyt mitään" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Valintaan ei lisätty mitään haulla \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Valinnasta ei poistettu mitään haulla \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Valinnasta ei löytynyt mitään hakusanalla \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2839,26 +2865,26 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" -msgstr "" +msgstr "HK" #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" -msgstr "" +msgstr "ÄHK" #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" -msgstr "" +msgstr "SL" #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" -msgstr "" +msgstr "K" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49 @@ -2880,8 +2906,12 @@ "{1}" msgstr "" +"Virhe säännöllistä lauseketta \"{0}\" jäsennettäessä. Koko virhe:\n" +"\n" +"{1}" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:263 msgid "Key cannot be empty when tag operator is used. Sample use: key=value" msgstr "" +"Avain ei saa olla tyhjä, kun käytetään tägi-operaattoria. Malli: avain=arvo" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:462 @@ -2894,10 +2924,10 @@ #, java-format msgid "Unexpected token. Expected {0}, found {1}" -msgstr "" +msgstr "Odottamaton symboli. Odotettu {0}, löydetty {1}" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659 #, java-format msgid "Unexpected token: {0}" -msgstr "" +msgstr "Odottamaton symboli: {0}" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670 @@ -2907,5 +2937,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695 msgid "Missing operator for NOT" -msgstr "" +msgstr "EI-operaattorilta puuttuu parametri" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702 @@ -2916,13 +2946,13 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:707 msgid "Range of numbers expected" -msgstr "" +msgstr "Odotettiin lukuväliä" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710 msgid "Changeset id expected" -msgstr "" +msgstr "Odotettiin muutoskokoelman tunnusta" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:712 msgid "Version expected" -msgstr "" +msgstr "Odotettiin versiota" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 @@ -2930,5 +2960,5 @@ msgid "" "Warning: automatically truncating value of tag ''{0}'' on deleted object {1}" -msgstr "" +msgstr "Varoitus: kohteen {1} tagin ''{0}'' arvo typistettiin automaattisesti" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67 @@ -2943,5 +2973,5 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 msgid "Precondition Violation" -msgstr "" +msgstr "Esiehto ei täyty" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82 @@ -2952,5 +2982,5 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87 msgid "API Capabilities Violation" -msgstr "" +msgstr "APIn rajoitus ylitetty" #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35 @@ -2979,5 +3009,5 @@ #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87 msgid "Cycling dependencies" -msgstr "" +msgstr "Syklisiä riippuvuuksia" #. Strings in JFileChooser @@ -2985,8 +3015,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3053,5 +3083,5 @@ #, java-format msgid "Changed nodes of {0}" -msgstr "" +msgstr "Kohteen {0} solmuja muutettu" #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101 @@ -3112,5 +3142,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Double conflict" -msgstr "" +msgstr "Kaksinkertainen ristiriita" #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:52 @@ -3126,8 +3156,8 @@ #, java-format msgid "Add conflict for ''{0}''" -msgstr "" +msgstr "Lisää ristiriita kohteelle {0}" #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3135,9 +3165,10 @@ "Cannot undo command ''{0}'' because layer ''{1}'' is not present any more" msgstr "" +"Komentoa \"{0}\" ei voi perua, koska tasoa \"{1}\" ei ole enää olemassa" #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:42 #, java-format msgid "Resolve conflicts in coordinates in {0}" -msgstr "" +msgstr "Ratkaise ristiriidat kohteen {0} koordinaateissa" #. should not happen @@ -3145,10 +3176,10 @@ #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:74 msgid "Cannot resolve undecided conflict." -msgstr "" +msgstr "Ristiriitaa ei voi ratkaista, koska päätös puuttuu" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110 msgid "At least one object to delete required, got empty collection" -msgstr "" +msgstr "Pitäisi olla ainakin yksi poistettava kohde, saatiin tyhjä kokoelma" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157 @@ -3198,5 +3229,5 @@ #, java-format msgid "Deleted ''{0}''" -msgstr "" +msgstr "Poistettiin \"{0}\"" #. leave message in one tr() as there is a grammatical @@ -3226,24 +3257,26 @@ "because you don't see the real object.
Do you really want to delete?" msgstr "" +"Poistettavana on keskeneräisiä kohteita.
Siitä seuraa ongelmia, koska " +"todellista kohdetta ei näy.
Poistetaanko ne silti?" #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:42 #, java-format msgid "Resolve conflicts in deleted state in {0}" -msgstr "" +msgstr "Ratkaise ristiriidat kohteen {0} poistettu-tilassa" #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:38 #, java-format msgid "Set the ''modified'' flag for node {0}" -msgstr "" +msgstr "Merkitse solmu {0} muokatuksi" #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:39 #, java-format msgid "Set the ''modified'' flag for way {0}" -msgstr "" +msgstr "Merkitse polku {0} muokatuksi" #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:40 #, java-format msgid "Set the ''modified'' flag for relation {0}" -msgstr "Merkitään relaatio {0} muutetuksi" +msgstr "Merkitse relaatio {0} muokatuksi" #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:130 @@ -3254,18 +3287,18 @@ msgstr[1] "Siirrä {0} pistettä" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +msgstr "Kohde \"{0}\" tuhottiin" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" msgid_plural "Purged {0} objects" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +msgstr[0] "Tuhottiin {0} kohde" +msgstr[1] "Tuhottiin {0} kohdetta" + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3273,6 +3306,8 @@ "{1}" msgstr "" - -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +"Huomio: polku {0} tuhottiin, koska sille oli jäänyt alle kaksi solmua " +"(tarkalleen {1})." + +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3310,5 +3345,5 @@ msgstr "Selvitä {0} relaation {1} tagikonfliktia" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3320,10 +3355,10 @@ #, java-format msgid "Resolve version conflict for node {0}" -msgstr "" +msgstr "Ratkaise ristiriidat solmun {0} versiossa" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:39 #, java-format msgid "Resolve version conflict for way {0}" -msgstr "" +msgstr "Ratkaise ristiriidat polun {0} versiossa" #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40 @@ -3335,10 +3370,10 @@ #, java-format msgid "Resolve conflicts in node list of way {0}" -msgstr "" +msgstr "Ratkaise ristiriidat polun {0} solmulistassa" #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:66 #, java-format msgid "Main dataset does not include node {0}" -msgstr "" +msgstr "Päädatajoukossa ei ole solmua {0}" #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58 @@ -3422,5 +3457,5 @@ #, java-format msgid "Warning: failed to persist preferences to ''{0}''" -msgstr "" +msgstr "Varoitus: asetusten tallennus tiedostoon \"{0}\" epäonnistui" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:440 @@ -3435,4 +3470,6 @@ "not a directory." msgstr "" +"Varoitus: Asetusten alustaminen epäonnistui. Asetushakemisto \"{0}\" ei ole " +"hakemisto." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:452 @@ -3442,4 +3479,6 @@ "not a directory." msgstr "" +"Asetusten alustaminen epäonnistui.
Asetushakemisto \"{0}\" ei ole " +"hakemisto." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:460 @@ -3449,4 +3488,6 @@ "preference directory: {0}" msgstr "" +"Varoitus: Asetusten alustaminen epäonnistui. Puuttuvaa asetushakemistoa ei " +"voitu luoda: {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:463 @@ -3456,4 +3497,6 @@ "preference directory: {0}" msgstr "" +"Asetusten alustaminen epäonnistui.
Puuttuvaa asetushakemistoa ei " +"voitu luoda: {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:474 @@ -3462,4 +3505,6 @@ "Warning: Missing preference file ''{0}''. Creating a default preference file." msgstr "" +"Varoitus: Asetustiedosto \"{0}\" puuttuu. Luodaan oletusmuotoinen " +"asetustiedosto." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:478 @@ -3469,4 +3514,6 @@ "file." msgstr "" +"Varoitus: Asestustiedosto \"{0}\" korvataan oletusmuotoisella " +"asetustiedostolla." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:486 @@ -3476,4 +3523,6 @@ "to default: {0}" msgstr "" +"Asetusten alustaminen epäonnistui.
Asetustiedostoa ei voitu " +"palauttaa oletusarvoihin: {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:499 @@ -3483,4 +3532,6 @@ "
and creating a new default preference file." msgstr "" +"Asetustiedostossa oli virheitä.
Vanha kopioidaan tiedostoon
{0}" +"
ja luodaan uusi oletusarvoinen asetustiedosto." #: ../core/src/org/openstreetmap/josm/data/Preferences.java:509 @@ -3490,9 +3541,11 @@ "default: {0}" msgstr "" +"Varoitus: Asetusten alustaminen epäonnistui. Asetustiedostoa ei voitu " +"palauttaa oletusarvoihin: {0}" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:535 #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''" -msgstr "" +msgstr "Virhe: Odottamaton rivi \"{0}\" kirjanmerkkitiedostossa \"{1}\"" #: ../core/src/org/openstreetmap/josm/data/Preferences.java:545 @@ -3501,4 +3554,6 @@ "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''" msgstr "" +"Virhe: Virheellinen double-liukuluku \"{0}\" kirjanmerkkitiedoston \"{2}\" " +"rivillä \"{1}\"" #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94 @@ -3519,5 +3574,5 @@ #, java-format msgid "Error: Unexpected line ''{0}'' in bookmark list from server" -msgstr "" +msgstr "Virhe: Odottamaton rivi \"{0}\" palvelimen kirjanmerkkilistassa" #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212 @@ -3527,4 +3582,6 @@ "server" msgstr "" +"Virhe: Virheellinen double-liukuluku \"{0}\" palvelimen kirjanmerkkilistan " +"rivillä \"{1}\"" #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229 @@ -3534,9 +3591,11 @@ "{1}" msgstr "" +"Kirjanmerkkien lataus URLista \"{0}\" epäonnistui turvallisuussyistä. Virhe " +"oli: {1}" #: ../core/src/org/openstreetmap/josm/data/Version.java:47 #, java-format msgid "Failed to load resource ''{0}'', error is {1}." -msgstr "" +msgstr "Resurssin \"{0}\" lataus epäonnistui. Virhe on {1}" #: ../core/src/org/openstreetmap/josm/data/Version.java:98 @@ -3550,8 +3609,9 @@ "Warning: unexpected JOSM version number in revison file, value is ''{0}''" msgstr "" +"Varoitus: tuntematon JOSMin versionumero versiotiedostossa, arvo on \"{0}\"" #: ../core/src/org/openstreetmap/josm/data/Version.java:145 msgid "Warning: the revision file ''/REVISION'' is missing." -msgstr "" +msgstr "Varoitus: versiotiedosto \"/REVISION\" puuttuu" #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76 @@ -3579,5 +3639,5 @@ #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25 msgid "Projected Coordinates" -msgstr "" +msgstr "Projisoidut koordinaatit" #. short symbol for South @@ -3623,6 +3683,6 @@ "ongelmitta." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3630,18 +3690,18 @@ #, java-format msgid "Missing merge target for way with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +msgstr "Polulta numero {0} puuttuu yhdistämiskohde" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +msgstr "Kohteelta numero {0} puuttuu yhdistämiskohde" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format msgid "Missing merge target for node with id {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +msgstr "Solmulta numero {0} puuttuu yhdistämiskohde" + +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3650,5 +3710,5 @@ msgstr "Relaatio id = {0} puuttuu kohdejoukosta" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3656,90 +3716,15 @@ #, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "S" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "P" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "teksti" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "K" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "T" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "K" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "L" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "P" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "E" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

Suodatus päällä

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} kohdetta piilossa" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "{0} kohdetta himmeänä" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "" -"

Saat kaikki kohteet näkyviin sulkemalla suodinpaneelin.

" +msgstr "Kohteelta, jonka tyyppi on {0} ja numero {1}, puuttuu yhdistämiskohde" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 #, java-format msgid "ID > 0 expected. Got {0}." -msgstr "" +msgstr "Tunnisteen oletettiin olevan > 0. Saatiin {0}." #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:458 #, java-format msgid "Version > 0 expected. Got {0}." -msgstr "" +msgstr "Version oletettiin olevan > 0. Saatiin {0}." #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:544 @@ -3839,17 +3824,17 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15 msgid "Relation: selected" -msgstr "" +msgstr "Relaatio: valittu" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16 msgid "Node: standard" -msgstr "" +msgstr "Solmu: vakio" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17 msgid "Node: connection" -msgstr "" +msgstr "Solmu: yhdistetty" #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18 msgid "Node: tagged" -msgstr "Piste: tagattu" +msgstr "Solmu: tagattu" #. teal @@ -3866,5 +3851,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "tausta" @@ -3885,5 +3870,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:28 msgid "areatext" -msgstr "" +msgstr "alueteksti" #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26 @@ -3897,4 +3882,6 @@ "NTF<->RGF93 grid" msgstr "" +"Varoitus: syötevirran avaus resurssille \"/data/{0}\" epäonnistui. NTF↔RGF93-" +"ruudukon lataus epäonnistui" #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:138 @@ -3971,30 +3958,29 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25 msgid "Guadeloupe Fort-Marigot 1949" -msgstr "" +msgstr "Guadeloupe Fort-Marigot 1949" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26 msgid "Guadeloupe Ste-Anne 1948" -msgstr "" +msgstr "Guadeloupe Ste-Anne 1948" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27 msgid "Martinique Fort Desaix 1952" -msgstr "" +msgstr "Martinique Fort Desaix 1952" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28 msgid "Reunion RGR92" -msgstr "" +msgstr "Réunion RGR92" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29 msgid "Guyane RGFG95" -msgstr "" +msgstr "Guayana RGFG95" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (Ranska)" +msgstr "UTM Ranska (DOM)" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 msgid "UTM Geodesic system" -msgstr "" +msgstr "UTM-karttajärjestelmä" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4002,9 +3988,11 @@ msgid "Could not read bookmarks from
''{0}''
Error was: {1}" msgstr "" +"Kirjanmerkkejä ei voitu lukea tiedostosta
\"{0}\"
Virhe oli: {1}" +"" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78 #, java-format msgid "Could not write bookmark.
{0}" -msgstr "" +msgstr "Kirjanmerkkejä ei voitu kirjoittaa.
{0}" #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201 @@ -4035,5 +4023,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "rata" @@ -4054,7 +4042,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4121,7 +4109,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "rakennus" @@ -4143,9 +4131,9 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:76 msgid "Precondition violation" -msgstr "" +msgstr "Esiehto ei täyty" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:104 msgid "Security exception" -msgstr "" +msgstr "Tietoturvapoikkeus" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:122 @@ -4159,5 +4147,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:157 msgid "Illegal Data" -msgstr "" +msgstr "Virheellinen data" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190 @@ -4182,21 +4170,21 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261 msgid "Authentication Failed" -msgstr "" +msgstr "Todennus epäonnistui" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277 msgid "Authorisation Failed" -msgstr "" +msgstr "Valtuutus epäonnistui" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:293 msgid "Client Time Out" -msgstr "" +msgstr "Asiakkaan aikakatko" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:309 msgid "Communication with OSM server failed" -msgstr "" +msgstr "Yhteydenotto palvelimeen epäonnistui" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:325 msgid "Authentication failed" -msgstr "" +msgstr "Todennus epäonnistui" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343 @@ -4210,8 +4198,8 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" -msgstr "" +msgstr "Näytä ohje" #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:70 @@ -4270,4 +4258,6 @@ "filename" msgstr "" +"Lataa kaikki. Kukin voi olla x1,y1,x2,y2 tai parametrit lat=y&lon=x&zoom=z " +"sisältävä URL-osoite tai tiedostonimi" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60 @@ -4427,5 +4417,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4730,12 +4720,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4746,6 +4736,6 @@ msgstr "Tagit" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4753,6 +4743,6 @@ msgstr "Pisteet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4760,9 +4750,9 @@ msgstr "Jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4771,5 +4761,5 @@ msgstr[1] "Tagit ({0} ristiriitaa)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4778,26 +4768,26 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Pisteet (ristiriitoja)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4807,25 +4797,25 @@ "enää ristiriitoja." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Jäsenet (ristiriitoja)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Tämän relaation jäsenluettelossa on vielä ristiriitoja." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Ominaisuudet (ristiriitoja)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Ristiriidan ratkaisu" @@ -4873,5 +4863,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Minun versioni" @@ -4882,5 +4872,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4894,5 +4884,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Palvelimen versio" @@ -4961,5 +4951,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4971,5 +4961,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Alas" @@ -5068,64 +5058,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -"Datajoukossa on vielä {0} objekti, johon viitataan
palvelimelta " -"poistetusta relaatiosta {1}.
Haluatko palauttaa relaation?" -msgstr[1] "" -"Datajoukossa on vielä {0} objektia, joihin viitataan
palvelimelta " -"poistetusta relaatiosta {1}.
Haluatko palauttaa relaation?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Palautetaanko riippuvaiset objektit?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5133,128 +5068,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Koordinaatit:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "poistettu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Käytä minun koordinaatteja" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Käytä palvelimen koordinaatteja" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" -"Jos haluat säilyttää tekemäsi paikallisen version,
JOSMin täytyy " -"asettaa objektin {0} tunniste nollaksi.
Seuraavan lähetyksen yhteydessä " -"palvelin asettaa
sille uuden tunnisteen.
Toteutetaanko muutos?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSMin täytyy poistaa tekemäsi paikallinen objekti {0}
datajoukosta." -"
Toteutetaanko muutos?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" msgstr "" @@ -5402,5 +5267,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "kaikki" @@ -5480,7 +5345,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5490,6 +5355,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5691,5 +5556,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5745,25 +5610,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Peruuta ristiriitojen selvitys ja sulje ikkuna" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5775,22 +5640,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Selvitä ristiriidat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Piilota tai himmennä objekteja suotimilla." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5803,44 +5668,124 @@ msgstr "Lisää" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "Lisää suodin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Muokkaa suodinta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Poista suodin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Nosta suodinta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Laske suodinta" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Ota suodin käyttöön" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Piilota kohteet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Käänteinen suodatus" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Suodatustapa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "Suodin: {0} piilossa, {1} himmeänä" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Virhe ladattaessa tiedostoa" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "S" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "P" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "teksti" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "K" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "T" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "K" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "L" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "P" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "E" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

Suodatus päällä

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} kohdetta piilossa" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "{0} kohdetta himmeänä" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "" +"

Saat kaikki kohteet näkyviin sulkemalla suodinpaneelin.

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -5882,37 +5827,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Syötä uuden pisteen koordinaatit." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Anna asteet desimaalilukuna." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negatiiviset arvot tarkoittavat läntistä/eteläistä pallonpuoliskoa." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Syötä kelvollinen leveyspiiri väliltä -90–90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Syötä leveyspiiri väliltä -90–90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Syötä kelvollinen pituuspiiri väliltä -180–180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Syötä pituuspiiri väliltä -180–180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Sulje ikkuna ja luo uusi piste" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Sulje ikkuna luomatta uutta pistettä" @@ -5972,5 +5917,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relaatiot" @@ -6018,10 +5963,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "Lataa valittujen relaatioiden epätäydelliset jäsenet" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -6085,14 +6030,14 @@ msgstr "Valinta: Rel.:{0}/Polut:{1}/Pisteet:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Valinta: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6797,8 +6742,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6823,6 +6776,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7205,69 +7156,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Nimi" @@ -7847,5 +7799,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8512,8 +8464,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Tyyppi" @@ -8542,6 +8494,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "tuntematon" @@ -8875,5 +8827,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Ristiriitoja" @@ -9412,4 +9364,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9929,5 +9882,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Kuvaus" @@ -9978,5 +9931,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10049,23 +10002,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Datataso {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "ladatun alueen ulkopuolella" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10074,42 +10027,11 @@ msgstr[1] "Havaittiin {0} ristiriitaa." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -"{0} ristiriita selvitettiin automaattisesti, poistamalla
" -"{0} kohde, joka oli poistettu palvelimelta." -msgstr[1] "" -"{0} ristiriitaa selvitettiin automaattisesti. " -"poistamalla
{0} kohdetta, jotka on jo poistettu palvelimelta." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"Joudut selvittämään {0} ristiriidan.

Avaa lista selvittämättömistä " -"ristiriidoista ja käsittele se." -msgstr[1] "" -"Joudut selvittämään {0} ristiriitaa.

Avaa lista selvittämättömistä " -"ristiriidoista ja käsittele ne." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10118,32 +10040,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} koostuu:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Muuta GPX-tasoksi" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -13084,4 +13006,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14566,5 +14489,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14833,5 +14756,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Talonumeroiden interpolointilinja" @@ -15265,36 +15188,36 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 +msgid "on polygon" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "osoite" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Tee uusi relaatio" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Rakennukset" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Seuraava" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Osoitteet" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15448,10 +15371,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15506,7 +15433,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15515,13 +15442,13 @@ msgstr "vesi" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15569,32 +15496,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "osoite" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15606,18 +15533,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "Ranskan kiinteistörekisteri-WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15625,5 +15552,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15631,130 +15558,134 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "Kuvan resoluutio:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "Korkea resoluutio (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "Keskitasoinen resoluutio (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "Matala resolution (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16055,5 +15986,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -16062,14 +15993,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "" @@ -17343,4 +17274,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17381,9 +17331,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -18889,5 +18834,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Muut" @@ -19075,5 +19020,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "" @@ -19604,5 +19549,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "alue" @@ -19645,34 +19590,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Ei kuvaa" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19695,7 +19643,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Tagittomat polut" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20612,7 +20559,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Avaa tiedosto" +msgstr "" #. Strings in JFileChooser @@ -20894,7 +20840,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20903,10 +20856,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20915,5 +20868,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20922,15 +20875,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20940,10 +20893,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20952,5 +20905,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20959,5 +20912,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20966,10 +20919,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20978,5 +20931,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20986,5 +20939,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20993,15 +20946,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21010,5 +20963,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21141,5 +21094,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Numero" @@ -21678,5 +21631,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "" @@ -21689,5 +21642,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "metsä" @@ -21992,8 +21945,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "kyllä" @@ -22104,8 +22057,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "ei" @@ -22411,5 +22364,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "" @@ -22529,5 +22482,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "" @@ -22676,4 +22629,9 @@ msgid "Edit Motorway Junction" msgstr "Muokkaa moottoritien liittymää" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "" #. item "Waypoints/Motorway Junction" text "Number" @@ -22726,13 +22684,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operaattori" @@ -23000,6 +22958,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Korkeus" @@ -23851,5 +23809,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Jännite" @@ -24220,24 +24178,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Aukioloajat" @@ -24304,23 +24262,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "" @@ -24334,23 +24292,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "" @@ -24364,23 +24322,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -24494,6 +24452,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "" @@ -24509,5 +24467,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "maanalainen" @@ -24521,5 +24479,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Maksu" @@ -24695,5 +24653,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Pyörätuoli" @@ -24731,5 +24689,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "" @@ -24737,5 +24695,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Penkki" @@ -24854,5 +24812,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Loisto" @@ -25591,5 +25549,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Liikunta" @@ -25664,5 +25622,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25776,12 +25782,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25848,12 +25846,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25867,12 +25857,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -26034,5 +26016,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "urheilu" @@ -26059,4 +26042,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "australialainen jalkapallo" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "australialainen jalkapallo" @@ -26084,4 +26073,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "australialainen jalkapallo" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "" @@ -26124,6 +26119,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "amerikkalainen jalkapallo" +#, fuzzy +msgid "gaelic_football" +msgstr "australialainen jalkapallo" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26164,5 +26160,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "rugby" @@ -26283,6 +26285,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26296,5 +26302,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26316,4 +26321,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "tyyppi" @@ -26337,6 +26344,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26349,5 +26360,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26369,4 +26379,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "kenttä" @@ -26389,4 +26401,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "urheilukeskus" @@ -26409,4 +26423,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "stadion" @@ -26429,4 +26445,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -26628,158 +26646,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Amerikkalainen jalkapallo" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Australialainen jalkapallo" #. item "Sport (Ball)/Australian Football" +#: build/trans_presets.java:2071 +msgid "Edit Australian Football" +msgstr "" + +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Australialainen jalkapallo" + +#. item "Sport (Ball)/American Football" #: build/trans_presets.java:2077 -msgid "Edit Australian Football" -msgstr "" +#, fuzzy +msgid "Edit American Football" +msgstr "Australialainen jalkapallo" #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Australialainen jalkapallo" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Australialainen jalkapallo" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Australialainen jalkapallo" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Australialainen jalkapallo" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Muokkaa louhoksen ominaisuuksia" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Muokkaa raunioiden ominaisuuksia" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Koripallo" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "golfkenttä" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Kuulapeli" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Muokkaa kuulapelin ominaisuuksia" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Kriketti" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Muokkaa kriketin ominaisuuksia" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Krikettiverkko" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Muokkaa krikettiverkon ominaisuuksia" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Kroketti" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Jääkiekko" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Muokkaa jääkiekkopaikan ominaisuuksia" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Pöytätennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Keinotekoiset" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Rakennus" @@ -26787,5 +26841,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Julkinen rakennus" @@ -26793,10 +26847,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Muokkaa julkisen rakennuksen ominaisuuksia" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Kaupungintalo" @@ -26804,10 +26858,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Muokkaa kaupungintalon ominaisuuksia" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Suurlähetystö" @@ -26815,10 +26869,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Muokkaa suurlähetystön ominaisuuksia" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Oikeustalo" @@ -26827,10 +26881,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Muokkaa oikeustalon ominaisuuksia" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Vankila" @@ -26839,10 +26893,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Muokkaa vankilan ominaisuuksia" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Poliisiasema" @@ -26852,10 +26906,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Muokkaa poliisiaseman ominaisuuksia" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Paloasema" @@ -26864,10 +26918,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Muokkaa paloaseman ominaisuuksia" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Postitoimisto" @@ -26875,5 +26929,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Muokkaa postitoimiston ominaisuuksia" @@ -26881,15 +26935,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Lastentarha" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Muokkaa lastentarhan ominaisuuksia" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Koulu" @@ -26897,10 +26951,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Muokkaa koulun ominaisuuksia" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Yliopisto" @@ -26908,10 +26962,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Muokkaa yliopiston ominaisuuksia" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Korkeakoulu" @@ -26919,5 +26973,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Muokkaa korkeakoulun ominaisuuksia" @@ -26925,5 +26979,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Elokuvateatteri" @@ -26932,10 +26986,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Muokkaa elokuvateatterin ominaisuuksia" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Kirjasto" @@ -26944,9 +26998,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Muokkaa kirjaston ominaisuuksia" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Taidekeskus" @@ -26954,10 +27008,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Muokkaa taidekeskuksen ominaisuuksia" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Teatteri" @@ -26966,10 +27020,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Muokkaa teatterin ominaisuuksia" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "" @@ -26979,5 +27033,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "" @@ -26986,6 +27040,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Uskonto" @@ -26994,66 +27048,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "" @@ -27062,81 +27116,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Osoitteet" @@ -27145,5 +27199,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Muokkaa osoitetietoja" @@ -27151,5 +27205,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Talon numero" @@ -27157,25 +27211,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Talon nimi" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Kadunnimi" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Kaupungin nimi" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Postinumero" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Maakoodi" @@ -27184,5 +27238,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Muokkaa interpolointilinjaa" @@ -27190,61 +27244,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "pariton" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "parillinen" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Tehdas" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Muokkaa tehtaan ominaisuuksia" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Torni" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Muokkaa tornin ominaisuuksia" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "" @@ -27252,25 +27306,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Vesitorni" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Muokkaa vesitornin ominaisuuksia" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Kaasukello" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Muokkaa kaasukellon ominaisuuksia" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Majakka" @@ -27278,10 +27332,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Muokkaa majakan ominaisuuksia" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Tuulimylly" @@ -27289,10 +27343,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Muokkaa tuulimyllyn ominaisuuksia" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Putki" @@ -27301,41 +27355,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Muokkaa putken ominaisuuksia" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "kaasu" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Vedenpuhdistuslaitos" @@ -27345,10 +27399,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Nosturi" @@ -27356,5 +27410,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Muokkaa nosturin ominaisuuksia" @@ -27362,10 +27416,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "" @@ -27373,10 +27427,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Valvontakamera" @@ -27384,23 +27438,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Muokkaa valvontakameran ominaisuuksia" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "" @@ -27410,35 +27464,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "tuuli" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "vesivoima" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fossiilinen polttoaine" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "ydinvoima" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "kivihiili" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "" @@ -27447,10 +27501,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Muuntamoasema" @@ -27459,5 +27513,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Muokkaa muuntamoaseman ominaisuuksia" @@ -27465,10 +27519,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Korkeajännitelinjan torni" @@ -27479,23 +27533,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Sähkölinja" @@ -27504,74 +27558,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Muokkaa sähkölinjan ominaisuuksia" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Käymälä" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Postilaatikko" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Puhelin" @@ -27580,5 +27634,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Muokkaa puhelimen ominaisuuksia" @@ -27586,5 +27640,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Kolikot" @@ -27592,5 +27646,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "" @@ -27598,5 +27652,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "" @@ -27604,5 +27658,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "" @@ -27610,15 +27664,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Luottokortit" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Puhelinkortit" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Kierrätys" @@ -27627,5 +27681,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Muokkaa kierrätyspisteen ominaisuuksia" @@ -27633,35 +27687,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Paristot" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Peltitölkit" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Vaatteet" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Lasi" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Paperi" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Romumetalli" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "" @@ -27669,5 +27723,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "" @@ -27676,31 +27730,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "" @@ -27779,5 +27833,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27787,31 +27841,31 @@ msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Metsästyslava" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Muokkaa metsästyslavan ominaisuuksia" @@ -27820,30 +27874,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Korkeus" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "täysi" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Lähde" @@ -27852,10 +27906,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Muokkaa lähteen ominaisuuksia" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Juomavesi" @@ -27864,10 +27918,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Muokkaa juomaveden ominaisuuksia" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "" @@ -27876,5 +27930,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "" @@ -27882,5 +27936,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "" @@ -27888,15 +27942,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Kaupat" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "" @@ -27904,10 +27958,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Muokkaa autokaupan ominaisuuksia" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "" @@ -27916,28 +27970,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Pyöräkauppa" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Lähikauppa" @@ -27945,9 +27999,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Muokkaa lähikaupan tietoja" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Kioski" @@ -27955,27 +28009,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Muokkaa kioskin ominaisuuksia" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Matkatoimisto" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Muokkaa matkatoimistoa" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Lihakauppa" @@ -27983,9 +28037,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Muokkaa lihakaupan ominaisuuksia" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Leipomo" @@ -27993,9 +28047,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Muokkaa leipomon ominaisuuksia" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "" @@ -28003,18 +28057,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Luomukauppa" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Muokkaa luomukaupan ominaisuuksia" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "" @@ -28022,54 +28076,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "" @@ -28077,9 +28131,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "" @@ -28087,9 +28141,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Tee-se-itse-kauppa" @@ -28097,54 +28151,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Kampaamo" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Muokkaa kampaamon ominaisuuksia" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Kuivapesula" @@ -28152,9 +28206,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Muokkaa kuivapesulan ominaisuuksia" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Pesula" @@ -28162,9 +28216,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Muokkaa pesulan ominaisuuksia" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "" @@ -28172,24 +28226,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Muokkaa urheiluvälinekauppaa" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Muokkaa optikon ominaisuuksia" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Automaatti" @@ -28197,5 +28251,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Muokkaa automaatin tietoja" @@ -28203,97 +28257,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Automaatin tuotteet" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "julkisen liikenteen lippuja" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "julkisen liikenteen aikatauluja" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "juomat" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Raha" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Pankki" @@ -28301,14 +28355,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Muokkaa pankin ominaisuuksia" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Pankkiautomaatti" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Rahanvaihto" @@ -28316,5 +28370,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Muokkaa rahanvaihdon ominaisuuksia" @@ -28322,15 +28376,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Muokkaa pankkiautomaatin ominaisuuksia" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Terveys" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Lääkäri" @@ -28338,18 +28392,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Muokkaa lääkärin ominaisuuksia" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Hammaslääkäri" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Muokkaa hammaslääkärin ominaisuuksia" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Apteekki" @@ -28357,5 +28411,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Muokkaa apteekin ominaisuuksia" @@ -28363,9 +28417,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Sairaala" @@ -28373,10 +28427,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Muokkaa sairaalan ominaisuuksia" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "" @@ -28385,5 +28439,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "" @@ -28392,20 +28446,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Puhelinnumero" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -28413,5 +28467,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Eläinlääkäri" @@ -28420,64 +28474,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Muokkaa eläinlääkärin ominaisuuksia" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Maantiede" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Paikat" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Maanosa" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Muokkaa maanosan ominaisuuksia" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Maa" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Muokkaa maan ominaisuuksia" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Osavaltio" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Muokkaa osavaltion ominaisuuksia" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Seutu" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "" @@ -28485,15 +28539,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Suurkaupunki" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Muokkaa suurkaupungin ominaisuuksia" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Kaupunki" @@ -28501,10 +28555,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Muokkaa kaupungin ominaisuuksia" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Kaupunginosa" @@ -28512,25 +28566,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Muokkaa kaupunginosan ominaisuuksia" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Kunta" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Muokkaa kunnan ominaisuuksia" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Kylä" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Muokkaa kylän ominaisuuksia" @@ -28538,5 +28592,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "" @@ -28544,10 +28598,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Saari" @@ -28555,10 +28609,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Muokkaa saaren ominaisuuksia" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "" @@ -28566,5 +28620,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "" @@ -28572,5 +28626,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Luolan suuaukko" @@ -28578,10 +28632,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Muokkaa luolan suuaukon ominaisuuksia" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Huippu" @@ -28589,10 +28643,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Muokkaa huipun ominaisuuksia" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Jäätikkö" @@ -28600,10 +28654,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Muokkaa jäätikön ominaisuuksia" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Tulivuori" @@ -28611,70 +28665,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Muokkaa tulivuoren ominaisuuksia" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Rajat" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Kansallinen" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Muokkaa kansallisen rajan ominaisuuksia" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Hallinnollinen" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Muokkaa hallinnollisen rajan ominaisuuksia" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Muokkaa poliittisen rajan ominaisuuksia" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Muokkaa kansallispuiston rajan ominaisuuksia" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Maankäyttö" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Puu" @@ -28683,15 +28737,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Muokkaa puun ominaisuuksia" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Kasvitieteellinen nimi" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Metsä" @@ -28700,5 +28754,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Muokkaa metsän ominaisuuksia" @@ -28706,17 +28760,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "havumetsä" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "lehtimetsä" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "sekametsä" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Talousmetsä" @@ -28725,14 +28779,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Muokkaa talousmetsän ominaisuuksia" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Luonnonsuojelualue" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "" @@ -28740,25 +28794,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Kivikko, rakka" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Muokkaa kivikon ominaisuuksia" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Pusikko" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Muokkaa pusikon ominaisuuksia" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Tunturi" @@ -28766,10 +28820,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Muokkaa tunturin ominaisuuksia" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Nummi" @@ -28777,5 +28831,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Muokkaa nummen ominaisuuksia" @@ -28783,5 +28837,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)" @@ -28790,45 +28844,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Muokkaa maatilan pihan ominaisuuksia" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Peltoalueet" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Viinitarha" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Muokkaa viinitarhan ominaisuuksia" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Siirtolapuutarha" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Muokkaa siirtolapuutarhan ominaisuuksia" @@ -28836,25 +28890,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Puutarha" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Ruoho" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Muokkaa ruohon ominaisuuksia" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "" @@ -28862,10 +28916,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "" @@ -28873,20 +28927,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Puisto" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Muokkaa puiston ominaisuuksia" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "" @@ -28894,5 +28948,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -28900,15 +28954,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Asuinalue" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Muokkaa asuinalueen ominaisuuksia" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Hautausmaa (pieni)" @@ -28916,9 +28970,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Muokkaa pienen hautausmaan ominaisuuksia" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Hautausmaa" @@ -28926,39 +28980,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Muokkaa hautausmaan ominaisuuksia" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Kaupallinen" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Muokkaa kaupallisen alueen ominaisuuksia" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Toimistoalue" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Muokkaa toimistoalueen ominaisuuksia" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Teollisuusalue" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Muokkaa teollisuusalueen ominaisuuksia" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Rata-alue" @@ -28966,15 +29020,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Muokkaa rata-alueen ominaisuuksia" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Sotilasvoimat" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia" @@ -28982,50 +29036,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Rakennustyömaa" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Muokkaa rakennustyömaan ominaisuuksia" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Purettuja rakennuksia" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Rakentamiselle raivattu alue" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Kaatopaikka" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Muokkaa kaatopaikan ominaisuuksia" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Louhos" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Muokkaa louhoksen ominaisuuksia" @@ -29035,5 +29089,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "" @@ -29045,5 +29099,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "" @@ -29051,5 +29105,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "" @@ -29057,5 +29111,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -29066,5 +29120,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -29072,36 +29126,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -29109,5 +29163,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "" @@ -29116,5 +29170,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "" @@ -29122,34 +29176,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Kielto" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "" @@ -29158,15 +29212,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "" @@ -29174,5 +29228,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "" @@ -29181,5 +29235,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "" @@ -29187,5 +29241,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "" @@ -29293,5 +29347,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29302,17 +29356,17 @@ msgstr "polkupyörä" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "" @@ -29380,5 +29434,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29388,9 +29442,9 @@ msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "" @@ -29404,10 +29458,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "" @@ -29415,31 +29469,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "" @@ -29448,30 +29502,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "" @@ -29698,5 +29752,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "" @@ -33024,11 +33078,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "" @@ -33042,5 +33096,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" @@ -33395,4 +33449,70 @@ msgid "Sicily - Italy" msgstr "Sicily - Italy" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "Datajoukossa on vielä {0} objekti, johon viitataan
palvelimelta " +#~ "poistetusta relaatiosta {1}.
Haluatko palauttaa relaation?" +#~ msgstr[1] "" +#~ "Datajoukossa on vielä {0} objektia, joihin viitataan
palvelimelta " +#~ "poistetusta relaatiosta {1}.
Haluatko palauttaa relaation?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Palautetaanko riippuvaiset objektit?" + +#~ msgid "" +#~ "To keep your local version, JOSM
has to reset the id of " +#~ "primitive {0} to 0.
On the next upload the server will assign
it a " +#~ "new id.
Do you agree?" +#~ msgstr "" +#~ "Jos haluat säilyttää tekemäsi paikallisen version,
JOSMin täytyy " +#~ "asettaa objektin {0} tunniste nollaksi.
Seuraavan lähetyksen " +#~ "yhteydessä palvelin asettaa
sille uuden tunnisteen.
Toteutetaanko " +#~ "muutos?" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSMin täytyy poistaa tekemäsi paikallinen objekti {0}" +#~ "
datajoukosta.
Toteutetaanko muutos?" + +#~ msgid "" +#~ "{0} conflict has been resolved automatically by purging " +#~ "{0} object
from the local dataset because it is deleted on the server." +#~ msgid_plural "" +#~ "{0} conflicts have been resolved automatically by " +#~ "purging {0} objects
from the local dataset because they are deleted " +#~ "on the server." +#~ msgstr[0] "" +#~ "{0} ristiriita selvitettiin automaattisesti, " +#~ "poistamalla
{0} kohde, joka oli poistettu palvelimelta." +#~ msgstr[1] "" +#~ "{0} ristiriitaa selvitettiin automaattisesti. " +#~ "poistamalla
{0} kohdetta, jotka on jo poistettu palvelimelta." + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "Joudut selvittämään {0} ristiriidan.

Avaa lista selvittämättömistä " +#~ "ristiriidoista ja käsittele se." +#~ msgstr[1] "" +#~ "Joudut selvittämään {0} ristiriitaa.

Avaa lista selvittämättömistä " +#~ "ristiriidoista ja käsittele ne." + +#~ msgid "football" +#~ msgstr "amerikkalainen jalkapallo" + +#~ msgid "Football" +#~ msgstr "Amerikkalainen jalkapallo" #~ msgid "Unknown version" Index: /applications/editors/josm/i18n/po/fr.po =================================================================== --- /applications/editors/josm/i18n/po/fr.po (revision 22208) +++ /applications/editors/josm/i18n/po/fr.po (revision 22209) @@ -6,7 +6,7 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-26 14:28+0000\n" -"Last-Translator: Jérôme BLUM \n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-28 16:46+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Fr <>\n" "MIME-Version: 1.0\n" @@ -14,5 +14,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:52+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:07+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Language: French\n" @@ -26,5 +26,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -68,5 +68,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -76,5 +76,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -244,5 +244,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -250,6 +250,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -338,8 +338,7 @@ msgstr "Pas de calque de destination" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Ajouter un nœud…" @@ -663,5 +662,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1048,5 +1047,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1055,5 +1054,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1194,4 +1193,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Déplacer un nœud…" @@ -1493,6 +1493,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1715,6 +1715,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2363,5 +2361,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2615,10 +2613,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Rechercher..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Rechercher des objets" @@ -2626,49 +2624,49 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Veuillez entrer une chaine de caractère comme filtre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Entrer le texte à rechercher." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Entrer le texte à rechercher." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "remplacer la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "ajouter à la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "supprimer de la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "trouver dans la sélection" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "respecter la casse" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "tous les objets" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "Inclure les objects incomplets ou effacés dans la recherche" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "expression régulière" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" @@ -2676,18 +2674,18 @@ "nom." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" "\"Baker Street\" - ''Baker Street'' dans n’importe quelle clé ou nom." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak - ''Bak'' n’importe où dans le nom." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - clé ''type'' avec la valeur exacte ''route''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2697,21 +2695,21 @@ "*=valeur, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - pas ''Bak'' dans le nom." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "sens unique ? - oneway=yes, true, 1 ou on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot avec n’importe quelle valeur." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Options spéciales :" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2719,9 +2717,9 @@ "type: - type de l’objet (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "utilisateur :... - tous les objets modifiés par l’utilisateur" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" @@ -2729,5 +2727,5 @@ "anonymes" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "" @@ -2735,5 +2733,5 @@ "nouveaux objets)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2743,5 +2741,5 @@ "version attribuée)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2751,5 +2749,5 @@ "modifications donné (0 objets sans groupe de modifications attribué)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2759,5 +2757,5 @@ "nœuds : min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2767,9 +2765,9 @@ "nombre ou attributs : min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "role:... - objet avec un rôle donné dans une relation" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2779,21 +2777,21 @@ "12T14:51:09Z, 2009-11-12 ou T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - tous les objets modifiés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - tous les objets sélectionnés" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - tous les objets incomplets" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - tous les objets sans attribut" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2802,5 +2800,5 @@ "l’expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2809,9 +2807,9 @@ "l’expression" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "Utilisez | ou OR pour combiner avec le OU logique" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2819,5 +2817,5 @@ "contient :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2828,12 +2826,12 @@ "\\\\)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Utilisez ( et ) pour grouper des expressions" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2842,33 +2840,46 @@ msgstr "Filtrez" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Rechercher" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Appliquer le filtre." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Commencer la recherche" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Entrer une expression" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Aucun résultat trouvé pour \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Rien n’a été enlevé à la sélection en recherchant \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" @@ -2876,5 +2887,5 @@ "Aucun résultat lors de la recherche dans la sélection en cherchant ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2882,5 +2893,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2888,5 +2899,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2894,5 +2905,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2900,5 +2911,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -3039,8 +3050,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3183,5 +3194,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3315,11 +3326,11 @@ msgstr[1] "Déplacer {0} nœuds" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Objet purgé ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3328,5 +3339,5 @@ msgstr[1] "{0} objets enlevés" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3337,5 +3348,5 @@ "inférieur à 2. Actuellement il est de {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3373,5 +3384,5 @@ msgstr "Résoudre {0} conflits de tag pour la relation {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3719,6 +3730,6 @@ "travailler en toute sécurité." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3728,10 +3739,10 @@ msgstr "Cible de fusion manquante pour le chemin avec l’identifiant {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Cible de fusion manquante pour l’objet avec l’identifiant {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3739,5 +3750,5 @@ msgstr "Cible de fusion manquante pour le nœud avec l’identifiant {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3746,5 +3757,5 @@ msgstr "Cible de fusion manquante pour la relation avec l’identifiant {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3753,80 +3764,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "Cible de fusion manquante pour le type {0} avec l’identifiant {1}" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "E" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "H" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Texte" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "R" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "A" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "D" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "F" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

Filtre actif

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} objets cachés" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "{0} objets désactivés" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "" -"

Fermer la fenêtre de dialogue du filtre pour voir tous les objets." -"

" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3969,5 +3904,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "arrière-plan" @@ -4095,12 +4030,10 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (France)" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "Système géodésique UTM Nord fuseau 20" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4143,5 +4076,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "voie ferrée" @@ -4162,7 +4095,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4229,7 +4162,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "bâtiment" @@ -4318,5 +4251,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4553,5 +4486,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4866,12 +4799,12 @@ msgstr "le rôle {0} ne fait pas partie de la comparaison des paires {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Propriétés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4882,6 +4815,6 @@ msgstr "Attributs" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4889,6 +4822,6 @@ msgstr "Nœuds" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4896,9 +4829,9 @@ msgstr "Membres" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Aucun conflit d’attribut n’est résolu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4907,5 +4840,5 @@ msgstr[1] "Attributs ({0} conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4914,9 +4847,9 @@ msgstr[1] "{0} conflits d’attributs en attente d’être résolus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Nœuds (résolus)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4925,17 +4858,17 @@ "la liste de nœuds de ce chemin" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Nœuds (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Conflits à résoudre dans la liste des nœuds de ce chemin" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Membres (résolus)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4945,25 +4878,25 @@ "dans la liste des membres de cette relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Membres (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Conflits à résoudre dans la liste des membres de cette relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Pas de conflit de propriétés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Propriétés (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Des conflits de propriété sont en attente de résolution" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Résolution des conflits" @@ -5012,5 +4945,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Ma version" @@ -5021,5 +4954,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -5035,5 +4968,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Leur version" @@ -5115,5 +5048,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -5125,5 +5058,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Descendre" @@ -5230,70 +5163,9 @@ "commande de résolution" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" -"Une erreur est survenue lors de la communication avec le " -"serveur
Détails :{0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "La communication avec le serveur a échoué" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Oui, les restaurer également" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "Non, annuler l’opération" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -"{0} nœud utilisé sur le chemin {1}
a été supprimé sur le serveur." -"
Voulez-vous récupérer ce nœud ?" -msgstr[1] "" -"{0} nœuds utilisés sur le chemin {1}
ont été supprimé sur le serveur." -"
Voulez-vous récupérer ces nœuds ?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Restaurer ces nœuds également ?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -"{0} primitive se rapportant à la relation {1}
a été supprimée sur le " -"serveur.
Voulez-vous récupérer cette primitive ?" -msgstr[1] "" -"{0} primitives se rapportant à la relation {1}
ont été supprimées sur le " -"serveur.
Voulez-vous récupérer ces primitives ?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Restaurer les primitives ?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Propriétés de mon jeu de données, par exemple les données locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5303,126 +5175,59 @@ "éléments lorsque la fusion sera appliquée." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Propriétés de leur jeu de données, par exemple les données du serveur" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Coordonnées :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Etat supprimé :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "État visible :" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "Référencé par :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(aucun)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "non supprimé" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "visible (sur le serveur)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "non visible (sur le serveur)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Garder une copie de la version locale" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Supprimer physiquement du jeu de données local" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Conserver mes coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Conserver leurs coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "Ne pas résoudre le conflit de coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "Conserver mon état supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "Conserver leur état supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "Ne pas résoudre le conflit d’état" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "Conserver mon état de visibilité" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Oui, réinitialiser l’identifiant" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "Réinitialisation de l’identifiant à 0" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Conserver l’état de visbilité du serveur" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Oui, le supprimer" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM doit supprimer votre primitive locale avec l’identifiant {0}" -"
du jeu de données.
Êtes-vous d’accord ?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Suppression du jeu de données" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "Conflit non résolu entre deux états de visiblité" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5574,5 +5379,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "all" @@ -5653,7 +5458,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5663,6 +5468,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5874,5 +5679,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5931,25 +5736,25 @@ msgstr "Sélectionner un élément" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Appliquer la résolution des conflits et fermer la fenêtre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Appliquer la résolution des conflits et fermer la fenêtre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Appliquer la résolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Fermer quand même" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Continuer la résolution" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5967,22 +5772,22 @@ "conflits." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "Conflit partiellement résolu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Résoudre les conflits" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Résoudre les conflits pour ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Filtrer les objets et les masquer/désactiver." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5995,44 +5800,125 @@ msgstr "Ajouter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "Ajouter un filtre." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Modifier le filtre." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Supprimer le filtre." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Déplacer le filtre vers le haut." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Déplacer le filtre vers le bas." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Activer le filtre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Masquer les éléments" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Inverser le filtre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Mode filtre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "FIltre caché:{0} Désactivé:{1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Erreur lors du chargement du fichier" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "E" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "H" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Texte" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "R" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "A" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "D" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

Filtre actif

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} objets cachés" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "{0} objets désactivés" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "" +"

Fermer la fenêtre de dialogue du filtre pour voir tous les objets." +"

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -6074,37 +5960,37 @@ msgstr "Information avancées de l'objet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Veuillez entrer les coordonnées du nouveau nœud." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Utiliser les degrés décimaux" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Les valeurs négatives indiquent la partie Ouest/Sud de l’hémisphère." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Veuillez entrer une latitude valide entre -90° et 90°" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Veuillez entrer une latitude entre -90° et 90°" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Veuillez entrer une longitude valide entre -180° et 180°" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Veuillez entrer une longitude entre -180° et 180°" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Fermer la fenêtre et créer un nouveau nœud" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Fermer la fenêtre sans créer de nouveau nœud" @@ -6164,5 +6050,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relations" @@ -6210,10 +6096,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "Télécharger les membres incomplets des relations sélectionnées" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "Télécharger les membres incomplets" @@ -6277,14 +6163,14 @@ msgstr "Sélection : Relations : {0} / Chemins : {1} / Nœuds : {2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Sélection : {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "Obtenir les informations détaillées sur l'état interne des objets." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "Inspecter" @@ -7002,8 +6888,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -7028,6 +6922,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7410,69 +7302,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Nom" @@ -8106,5 +7999,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8788,8 +8681,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Type" @@ -8818,6 +8711,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "inconnue" @@ -9180,5 +9073,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Conflits détectés" @@ -9774,4 +9667,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -10336,5 +10230,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Description" @@ -10385,5 +10279,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10464,19 +10358,19 @@ "leur horodatage ont été ignorés." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Calque de données {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "en dehors de la zone téléchargée" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "version {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" @@ -10484,5 +10378,5 @@ "0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10491,42 +10385,11 @@ msgstr[1] "Il y avait {0} conflits détectés." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -"{0} conflit a été résolu automatiquement en enlevant {0} " -"objet
du jeu de données car il était supprimé sur le serveur." -msgstr[1] "" -"{0} conflits ont été résolus automatiquement en enlevant " -"{0} objets
du jeu de données car ils étaient supprimés sur le serveur." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"{0} conflit reste non résolu.
Veuillez ouvrir la fenêtre Listes des " -"conflits pour le résoudre manuellement." -msgstr[1] "" -"{0} conflits restent non résolus.
Veuillez ouvrir la fenêtre Listes des " -"conflits pour les résoudre manuellement." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "Fermer la fenêtre et continuer les modifications" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10535,32 +10398,32 @@ msgstr[1] "{0} supprimés" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} est consistué de :" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "vide" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "Version de l’API : {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Convertir en calque GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "Test de cohérence de l’ensemble de données" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "Pas de problème trouvé." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "Les problèmes suivants ont été trouvés:" @@ -13767,4 +13630,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -15444,5 +15308,5 @@ "html>" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15746,5 +15610,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Interpolation d’adresse" @@ -16233,36 +16097,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Multipolygone" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "adresse" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Créer une nouvelle relation" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Bâtiments" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Numéro" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Suivant" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Rue" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Adresses" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -16434,11 +16299,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "Désactiver le recadrage pendant le géoréférencement." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." msgstr "Sélectionner le premier calque WMS dans la liste" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." +msgstr "" #. item "Man Made/Pipeline" combo "Type" @@ -16492,7 +16361,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -16501,13 +16370,13 @@ msgstr "eau" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "symbole" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "parcelle" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "numéro de parcelle" @@ -16555,32 +16424,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "adresse" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "lieu-dit" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "section" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "commune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Activer le tampon automatique." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Taille maximale du tampon (en MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16597,9 +16466,9 @@ "CU_01_ConditionsGenerales_fr.html
" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "WMS du cadastre français" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -16607,10 +16476,10 @@ "html>" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Source" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16620,5 +16489,5 @@ "préférences." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16628,9 +16497,9 @@ "intermédiaires). Pratique pour lire les textes sur fond noir." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Permettre l’empilement de plusieurs calques" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -16638,5 +16507,5 @@ "gauche)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" @@ -16644,48 +16513,48 @@ #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "Résolution de l’image :" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "Haute résolution (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "Résolution moyenne (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "Basse résolution (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "filtre d’interpolation" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Par plus proche voisin (rapide) [ Par défaut ]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "Bilinéaire (rapide)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "Bicubique (lent)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "Multiplicateur d’images" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "Télécharger une seule image en plein écran" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" @@ -16693,63 +16562,63 @@ "mémoire)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "Carré de taille fixe (100 m par défaut)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Taille fixe (de 25 à 1000 mètres)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "Calques :" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "Mers, fleuves, rivières, piscines." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "Bâtiments, constructions." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "Symboles." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "Parcelles." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "Numéros des parcelles, noms des rues." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "Adresses, numéros d’adresses." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "Lieu-dit, hameau, site." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "Sections et sous-sections cadastrales." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "Limites communales" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "Multiplicateur d’images matricielles" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "Afficher les chevauchements :" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -16757,5 +16626,5 @@ "taille est dépassée" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16764,4 +16633,8 @@ "Sélectionner automatiquement le premier calque WMS lors du téléchargement du " "cadastre." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 @@ -17086,5 +16959,5 @@ msgstr "Zone délimitée de la commune : {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -17096,9 +16969,9 @@ "Veuillez en créer un nouveau." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Erreur de format du cache" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -17107,5 +16980,5 @@ "actuelle" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "Erreur de cache pour la zone Lambert" @@ -18414,4 +18287,26 @@ msgstr "Glisser pour agrandir l’image dans l’axe Y" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +#, fuzzy +msgid "Create Stops from GTFS ..." +msgstr "Créer des Stops depuis un fichier GPX" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +#, fuzzy +msgid "Create Stops from a GTFS file" +msgstr "Créer des Stops depuis un fichier GPX" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "Une execption \"{0}\" s'est produite" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +#, fuzzy +msgid "GTFS-Stops" +msgstr "Arrêts" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -18453,9 +18348,4 @@ msgid "Create Stops from a GPX file" msgstr "Créer des Stops depuis un fichier GPX" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" -msgstr "Une execption \"{0}\" s'est produite" #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83 @@ -20059,5 +19949,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Autre" @@ -20247,5 +20137,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Multipolygone" @@ -20779,5 +20669,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "zone" @@ -20820,34 +20710,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Aucune donnée" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -20870,7 +20763,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Chemins sans attribut" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -21710,7 +21602,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:23 -#, fuzzy msgid "Abort file chooser dialog" -msgstr "Annuler la modification des attributs et fermer la fenêtre" +msgstr "" #. Strings in JFileChooser @@ -21822,7 +21713,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Sélectionnez un fichier" +msgstr "" #. Strings in JFileChooser @@ -22139,7 +22029,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -22151,10 +22048,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Fournit des capacités de calcul d’itinéraire." #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -22163,5 +22060,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -22172,15 +22069,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Permet d’ajouter des marqueurs/points sur les positions GPS." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Ouvre une fenêtre de modification des attributs sous forme de table." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -22193,10 +22090,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "Créer des maisons mitoyennes depuis des blocs entiers." #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -22205,5 +22102,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -22214,5 +22111,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -22223,10 +22120,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "Authoriser la restauration de l'objet depuis la base de donnée OSM" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -22237,5 +22134,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -22245,5 +22142,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -22254,15 +22151,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "Facilite le téléchargement le long de plusieurs chemins interconnectés" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "Sélectionne une séquence de chemins connectés non-ramifiés" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -22272,5 +22169,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -22404,5 +22301,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Référence" @@ -22941,5 +22838,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "métal" @@ -22952,5 +22849,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "bois" @@ -23255,8 +23152,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "oui" @@ -23367,8 +23264,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "non" @@ -23674,5 +23571,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "voie d’accès" @@ -23792,5 +23689,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "randonnée" @@ -23939,4 +23836,9 @@ msgid "Edit Motorway Junction" msgstr "Modifier un échangeur" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Numéro" #. item "Waypoints/Motorway Junction" text "Number" @@ -23989,13 +23891,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Compagnie" @@ -24263,6 +24165,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Altitude" @@ -25114,5 +25016,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Tension" @@ -25483,24 +25385,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Horaires d’ouverture" @@ -25567,23 +25469,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24h/24 7j/7" @@ -25597,23 +25499,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "Lun-Ven 08:30-20:00" @@ -25627,23 +25529,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Mar-Dim 08:00-15:00 ; Sam 08:00-12:00" @@ -25757,6 +25659,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Numéro de référence" @@ -25772,5 +25674,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "souterraine" @@ -25784,5 +25686,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Payant" @@ -25958,5 +25860,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Fauteuils roulants" @@ -25994,5 +25896,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Abri" @@ -26000,5 +25902,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Banc" @@ -26117,5 +26019,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Balise lumineuse" @@ -26854,5 +26756,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Sports" @@ -26927,5 +26829,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -27039,12 +26989,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -27111,12 +27053,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -27130,12 +27064,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -27297,5 +27223,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "terrain de sport" @@ -27322,4 +27249,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "football australien" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "football australien" @@ -27347,4 +27280,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "football australien" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "canoë" @@ -27387,6 +27326,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "football américain" +#, fuzzy +msgid "gaelic_football" +msgstr "football australien" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27427,5 +27367,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "rugby" @@ -27546,6 +27492,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -27559,5 +27509,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -27579,4 +27528,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "type" @@ -27600,6 +27551,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -27612,5 +27567,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -27632,4 +27586,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "terrain" @@ -27652,4 +27608,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "centre de sports" @@ -27672,4 +27630,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "stadium" @@ -27692,4 +27652,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "piste" @@ -27891,158 +27853,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Football américain" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Modifier le football américain" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Football australien" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Modifier le football australien" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Football australien" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Modifier le football australien" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Modifier le football américain" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Modifier le football australien" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Modifier le football américain" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Modifier le football américain" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Modifier le rugby" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Modifier le rugby" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Modifier le baseball" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Modifier le basketball" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Modifier un parcours de golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "golf_course" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Jeu de boules" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Modifier le jeu de boules" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Boulingrin" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Modifier le boulingrin" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Modifier le cricket" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Filets de cricket" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Modifier des filets de cricket" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Modifier le croquet" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Modifier le hockey" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelote" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Modifier la pelote basque" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Sport de raquette" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Modifier un sport de raquette" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Modifier le rugby" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Tennis de table" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Modifier le tennis de table" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Modifier le tennis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Artificiel" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Bâtiment" @@ -28050,5 +28048,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Bâtiment public" @@ -28056,10 +28054,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Modifier un bâtiment public" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Mairie" @@ -28067,10 +28065,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Modifier une mairie" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Ambassade" @@ -28078,10 +28076,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Modifier une ambassade" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Palais de justice" @@ -28090,10 +28088,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Modifier un palais de justice" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Prison" @@ -28102,10 +28100,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Modifier une prison" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Commissariat de police" @@ -28115,10 +28113,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Modifier un commissariat de police" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Caserne de pompiers" @@ -28127,10 +28125,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Modifier une caserne de pompiers" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Bureau de poste" @@ -28138,5 +28136,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Modifier un bureau de poste" @@ -28144,15 +28142,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Jardin d’enfants" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Modifier un jardin d’enfants" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "École" @@ -28160,10 +28158,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Modifier une école" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Université" @@ -28171,10 +28169,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Modifier une université" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Établissement d’enseignement supérieur" @@ -28182,5 +28180,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Modifier un établissement d’enseignement supérieur" @@ -28188,5 +28186,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Cinéma" @@ -28195,10 +28193,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Modifier un cinéma" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Bibliothèque" @@ -28207,9 +28205,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Modifier une bibliothèque" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Centre artistique" @@ -28217,10 +28215,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Modifier un centre artistique" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Théâtre" @@ -28229,10 +28227,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Modifier un théatre" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Lieu de culte" @@ -28242,5 +28240,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Modifier un lieu de culte" @@ -28249,6 +28247,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Religion" @@ -28257,66 +28255,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "bahaïsme" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "bouddhisme" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "christianisme" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hindouisme" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "jaïnisme" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "judaïsme" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "islam" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sikhisme" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "spiritualisme" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoïsme" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "unitarisme" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zoroastrisme" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Dénomination" @@ -28325,81 +28323,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglicanisme" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptisme" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "catholicisme" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "évangélisme" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "témoins de Jehovah" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "luthérianisme" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "méthodisme" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormonisme" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "orthodoxie" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "pentecôtisme" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "presbytérianisme" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestantisme" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "chiisme" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "sunnisme" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Adresses" @@ -28408,5 +28406,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Modifier l’adresse" @@ -28414,5 +28412,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Numéro du bâtiment" @@ -28420,25 +28418,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Nom de la maison" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Nom de la rue" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Nom de la ville" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Code postal" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Indicatif du pays" @@ -28447,5 +28445,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Modifier une interpolation d’adresse" @@ -28453,61 +28451,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Numérotation" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "pair" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "impair" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "alphabétique" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Édifices" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Usine" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Modifier une usine" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Structure de grande hauteur" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Modifier une structure de grande hauteur" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "Type de structure" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "communication" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "observation" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Hauteur (mètres)" @@ -28515,25 +28513,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Château d’eau" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Modifier un château d’eau" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Gazomètre" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Modifier un gazomètre" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Phare" @@ -28541,10 +28539,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Modifier un phare" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Moulin à vent" @@ -28552,10 +28550,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Modifier un moulin à vent" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Canalisation" @@ -28565,41 +28563,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Modifier une canalisation" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "turbine à gaz" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "chaleur" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "pétrole" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "égouts" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "toute substance" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Commune" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "sous-marine" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "aérienne" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Station d’épuration" @@ -28609,10 +28607,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Modifier une station d’épuration" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Grue" @@ -28620,5 +28618,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Modifier une grue" @@ -28626,10 +28624,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Modifier une balise lumineuse" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Équipement de topographie" @@ -28637,10 +28635,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Modifier un équipement de topographie" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Surveillance" @@ -28648,23 +28646,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Modifier une caméra de surveillance" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "intérieur" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "extérieur" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "public" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Centrale électrique" @@ -28674,35 +28672,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Modifier une centrale électrique" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "éolienne" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "hydroélectrique" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fossile" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "nucléaire" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "charbon" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "solaire photovoltaïque" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Station électrique" @@ -28711,10 +28709,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Modifier une station électrique" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Transformateur électrique" @@ -28723,5 +28721,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Modifier un transformateur électrique" @@ -28729,10 +28727,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Référence de la ligne" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Pylône électrique" @@ -28743,23 +28741,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Modifier un pylône électrique" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "pylônes" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "pylône" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "Référence du pylône" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Ligne électrique" @@ -28768,74 +28766,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Modifier une ligne électrique" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Type de ligne" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "à haute tension" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "à basse tension" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Nombre de câbles" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Nombre de conducteurs par câbles" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "simple" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "double" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "triple" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "quadruple" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Équipements" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Toilettes publiques" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "limité" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Paiement" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Boîte aux lettres" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Cabine téléphonique" @@ -28844,5 +28842,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Modifier une cabine téléphonique" @@ -28850,5 +28848,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Pièces" @@ -28856,5 +28854,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Billets" @@ -28862,5 +28860,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Porte-monnaie électronique" @@ -28868,5 +28866,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Cartes de débit" @@ -28874,15 +28872,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Cartes de crédit" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Cartes téléphoniques" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Point de recyclage" @@ -28891,5 +28889,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Modifier un point de recyclage" @@ -28897,35 +28895,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Batteries" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Canettes" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Vêtements" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Verre" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Ferraille" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "Poubelle" @@ -28933,5 +28931,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Modifier une poubelle" @@ -28940,31 +28938,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "Dossier" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Matériau" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "pierre" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "plastique" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Couleur" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "noir" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "marron" @@ -29043,5 +29041,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -29051,31 +29049,31 @@ msgstr "vert" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "rouge" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "bleu" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "gris" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "blanc" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Nombre de places" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Hutte de chasse" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Hutte de chasse" @@ -29084,30 +29082,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Hauteur" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "faible" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "moyenne" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "grande" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Camouflé" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Verrouillé" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Fontaine" @@ -29116,10 +29114,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Modifier une fontaine" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Point d’eau potable" @@ -29128,10 +29126,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Modifier un point d’eau potable" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Hydrant" @@ -29140,5 +29138,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Modifier un hydrant" @@ -29146,5 +29144,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Tour d’abandon" @@ -29152,15 +29150,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Modifier une tour d’abandon" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Commerce" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Concessionnaire automobile" @@ -29168,10 +29166,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Modifier une concession" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Magasin de vélos" @@ -29180,28 +29178,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Modifier un magasin de vélo" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermarché" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Modifier un supermarché" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Droguerie" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Modifier une droguerie" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Épicerie" @@ -29209,9 +29207,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Modifier une épicerie" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Kiosque à journaux" @@ -29219,27 +29217,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Modifier un kiosque à journaux" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Librairie" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Modifier une librairie" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Agence de voyage" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Modifier une agence de voyage" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Boucherie" @@ -29247,9 +29245,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Modifier une boucherie" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Boulangerie" @@ -29257,9 +29255,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Modifier une boulangerie" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Fleuriste" @@ -29267,18 +29265,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Modifier un fleuriste" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Magasin bio" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Modifier un magasin bio" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Alcool" @@ -29286,54 +29284,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Modifier un magasin d’alcool" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Boissons" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Modifier un magasin de boissons" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Informatique" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Modifier un magasin d’informatique" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Électronique" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Modifier un magasin d’électronique" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hi-Fi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Modifier un magasin Hi-Fi" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Ameublement" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Modifier un magasin d’ameublement" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Jardinerie" @@ -29341,9 +29339,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Modifier une jardinerie" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Quincaillerie" @@ -29351,9 +29349,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Modifier une quincaillerie" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Bricolage" @@ -29361,54 +29359,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Modifier un magasin de bricolage" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Papeterie" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Modifier une papeterie" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Salon de coiffure" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Modifier un salon de coiffure" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Chaussures" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Modifier un magasin de chaussures" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Jouets" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Modifier un magasin de jouets" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Vidéoclub" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Modifier un vidéoclub" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Pressing" @@ -29416,9 +29414,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Modifier un pressing" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Laverie" @@ -29426,9 +29424,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Modifier une laverie" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Sports en plein air" @@ -29436,24 +29434,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Modifier un magasin de sports en plein air" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Modifier un magasin de sport" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Opticien" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Modifier un opticien" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Distributeur automatique" @@ -29461,5 +29459,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Modifier un distributeur automatique" @@ -29467,97 +29465,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Produits vendus" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "tickets de transport public" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "plans de transport public" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "tickets de parking" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "nourriture" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "boissons" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "bonbons" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "cigarettes" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "photos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "alimentation animale" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "journaux" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "jouets" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "timbres" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "cartes SIM" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "bons téléphoniques" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "vouchers" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "Tunnel cyclable" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "préservatifs" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "sacs pour excrément" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "Cartes de fidélité" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Argent" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Banque" @@ -29565,14 +29563,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Modifier une banque" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Distributeur automatique" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Bureau de change" @@ -29580,5 +29578,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Modifier un bureau de change" @@ -29586,15 +29584,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Modifier un distributeur automatique" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Santé" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Cabinet médical" @@ -29602,18 +29600,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Modifier un cabinet médical" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Cabinet dentaire" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Modifier un cabinet dentaire" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Pharmacie" @@ -29621,5 +29619,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Modifier une pharmacie" @@ -29627,9 +29625,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Dispensaire" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Hôpital" @@ -29637,10 +29635,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Modifier un hôpital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Point d’accès d’urgence" @@ -29649,5 +29647,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Modifier un point d’accès d’urgence" @@ -29656,20 +29654,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Numéro du point" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Nom du point" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Numéro de téléphone" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Utiliser le code international, comme +12-345-67890)" @@ -29677,5 +29675,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Cabinet vétérinaire" @@ -29684,64 +29682,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Modifier un cabinet vétérinaire" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Géographie" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Lieux" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Continent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Modifier un continent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Pays" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Modifier un pays" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Département" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Modifier un département" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Région" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Modifier une région" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Comté/Canton" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Modifier un comté/canton" @@ -29749,15 +29747,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Ville de plus de 100 000 habitants" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Modifier une ville" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Ville de 10 000 à 100 000 habitants" @@ -29765,10 +29763,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Modifier une ville" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Banlieue" @@ -29776,25 +29774,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Modifier une banlieue" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Village" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Modifier un village" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Hameau" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Modifier un hameau" @@ -29802,5 +29800,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Lieu-dit" @@ -29808,10 +29806,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Modifier un lieu-dit" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "île" @@ -29819,10 +29817,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Modifier une île" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "îlot" @@ -29830,5 +29828,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Modifier un îlot" @@ -29836,5 +29834,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Entrée de grotte" @@ -29842,10 +29840,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Modifier une entrée de grotte" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Sommet" @@ -29853,10 +29851,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Modifier un sommet" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Glacier" @@ -29864,10 +29862,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Modifier un glacier" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Volcan" @@ -29875,70 +29873,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Modifier un volcan" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Frontières" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Nationale" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Modifier une frontière nationale" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Administrative" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Modifier une frontière administrative" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Civile" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Modifier une frontière civile" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Électorale" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Modifier une zone électorale" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Parc national" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Modifier une frontière d’un parc national" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Utilisation du terrain" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Arbre" @@ -29947,15 +29945,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Modifier un arbre" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Nom botanique" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Bois" @@ -29964,5 +29962,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Modifier un bois" @@ -29970,17 +29968,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "conifères" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "feuillus" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "conifères et feuillus" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Forêt" @@ -29989,14 +29987,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Modifier une forêt" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Réserve naturelle" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Modifier une réserve naturelle" @@ -30004,25 +30002,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Zone d’éboulements" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Modifier une zone d’éboulements" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Broussailles" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Modifier des broussailles" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Talus" @@ -30030,10 +30028,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Modifier un talus" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Lande" @@ -30041,5 +30039,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Modifier une lande" @@ -30047,5 +30045,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Cour de ferme" @@ -30054,45 +30052,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Modifier une cour de ferme" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Terre arable" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Modifier une terre arable" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Prairie" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Modifier une prairie" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Vigne" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Modifier une vigne" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Jardins familiaux" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Modifier des jardins familiaux" @@ -30100,25 +30098,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Jardin" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Modifier un jardin" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Herbe" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Modifier une zone herborée" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Village green (anglo-saxon)" @@ -30126,10 +30124,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Modifier un village green (anglo-saxon)" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Espace publique" @@ -30137,20 +30135,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Modifier un espace publique" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Parc" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Modifier un Parc" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Aire de jeux" @@ -30158,5 +30156,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Modifier une aire de jeux" @@ -30164,15 +30162,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Zone résidentielle" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Modifier une zone résidentielle" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Petit cimetière" @@ -30180,9 +30178,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Modifier un petit cimetière" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Cimetière" @@ -30190,39 +30188,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Modifier un cimetière" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Zone de commerces" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Modifier une zone de commerces" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Zone de bureaux" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Modifier une zone de bureaux" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Zone industrielle" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Modifier une zone industrielle" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Zone ferroviaire" @@ -30230,15 +30228,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Modifier une zone ferroviaire" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Terrain militaire" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Modifier un terrain militaire" @@ -30246,50 +30244,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Chantier" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Modifier un chantier" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Terrain vague" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Modifier un terrain vague" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Zone d’aménagement" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Modifier une zone d’aménagement" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Décharge" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Modifier une décharge" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Carrière" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Modifier une carrière" @@ -30299,5 +30297,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Modifier un multipolygone" @@ -30309,5 +30307,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "segment extérieur" @@ -30315,5 +30313,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "segment intérieur" @@ -30321,5 +30319,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -30330,5 +30328,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -30336,36 +30334,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -30373,5 +30371,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Interdiction de tourner" @@ -30380,5 +30378,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Modifier une interdiction de tourner" @@ -30386,34 +30384,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Restriction" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "Interdiction de tourner à gauche" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "Interdiction de tourner à droite" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "Interdiction d’aller tout droit" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "Interdiction de faire demi-tour" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "Obligation de tourner à droite" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "Obligation de tourner à gauche" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "Obligation d’aller tout droit" @@ -30422,15 +30420,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "chemin d’origine" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "nœud ou chemin \"via\"" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "au chemin" @@ -30438,5 +30436,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Itinéraire" @@ -30445,5 +30443,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Modifier un itinéraire" @@ -30451,5 +30449,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Type d’itinéraire" @@ -30557,5 +30555,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -30566,17 +30564,17 @@ msgstr "vélo" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "route" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "ski" @@ -30644,5 +30642,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -30652,9 +30650,9 @@ msgstr "chemin pour piétons" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "tramway" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "détour" @@ -30668,10 +30666,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "métro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Symbole" @@ -30679,31 +30677,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Réseau" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "État de l’itinéraire" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "proposé" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "alternatif" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "temporaire" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "connexion" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Couleur (hexadécimale)" @@ -30712,30 +30710,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "segment d’itinéraire" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "segment suivant" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "segment précédent" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "point d’arrêt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "point d’arrêt suivant" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "point d’arrêt précédent" @@ -30962,5 +30960,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "déprécié" @@ -34288,11 +34286,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "lieu" @@ -34306,5 +34304,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "données TIGER" @@ -34659,4 +34657,128 @@ msgid "Sicily - Italy" msgstr "Sicile - Italie" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "Une erreur est survenue lors de la communication avec le " +#~ "serveur
Détails :{0}" + +#~ msgid "Communication with server failed" +#~ msgstr "La communication avec le serveur a échoué" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Oui, les restaurer également" + +#~ msgid "No, cancel operation" +#~ msgstr "Non, annuler l’opération" + +#~ msgid "" +#~ "There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgid_plural "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" +#~ msgstr[0] "" +#~ "{0} nœud utilisé sur le chemin {1}
a été supprimé sur le serveur." +#~ "
Voulez-vous récupérer ce nœud ?" +#~ msgstr[1] "" +#~ "{0} nœuds utilisés sur le chemin {1}
ont été supprimé sur le serveur." +#~ "
Voulez-vous récupérer ces nœuds ?" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Restaurer ces nœuds également ?" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "{0} primitive se rapportant à la relation {1}
a été supprimée sur le " +#~ "serveur.
Voulez-vous récupérer cette primitive ?" +#~ msgstr[1] "" +#~ "{0} primitives se rapportant à la relation {1}
ont été supprimées sur " +#~ "le serveur.
Voulez-vous récupérer ces primitives ?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Restaurer les primitives ?" + +#~ msgid "Visible State:" +#~ msgstr "État visible :" + +#~ msgid "visible (on the server)" +#~ msgstr "visible (sur le serveur)" + +#~ msgid "not visible (on the server)" +#~ msgstr "non visible (sur le serveur)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Garder une copie de la version locale" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Supprimer physiquement du jeu de données local" + +#~ msgid "Keep my visible state" +#~ msgstr "Conserver mon état de visibilité" + +#~ msgid "Yes, reset the id" +#~ msgstr "Oui, réinitialiser l’identifiant" + +#~ msgid "Reset id to 0" +#~ msgstr "Réinitialisation de l’identifiant à 0" + +#~ msgid "Keep their visible state" +#~ msgstr "Conserver l’état de visbilité du serveur" + +#~ msgid "Yes, purge it" +#~ msgstr "Oui, le supprimer" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM doit supprimer votre primitive locale avec l’identifiant {0}" +#~ "
du jeu de données.
Êtes-vous d’accord ?" + +#~ msgid "Remove from dataset" +#~ msgstr "Suppression du jeu de données" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Conflit non résolu entre deux états de visiblité" + +#~ msgid "" +#~ "{0} conflict has been resolved automatically by purging " +#~ "{0} object
from the local dataset because it is deleted on the server." +#~ msgid_plural "" +#~ "{0} conflicts have been resolved automatically by " +#~ "purging {0} objects
from the local dataset because they are deleted " +#~ "on the server." +#~ msgstr[0] "" +#~ "{0} conflit a été résolu automatiquement en enlevant {0} " +#~ "objet
du jeu de données car il était supprimé sur le serveur." +#~ msgstr[1] "" +#~ "{0} conflits ont été résolus automatiquement en enlevant " +#~ "{0} objets
du jeu de données car ils étaient supprimés sur le serveur." + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "{0} conflit reste non résolu.
Veuillez ouvrir la fenêtre Listes des " +#~ "conflits pour le résoudre manuellement." +#~ msgstr[1] "" +#~ "{0} conflits restent non résolus.
Veuillez ouvrir la fenêtre Listes " +#~ "des conflits pour les résoudre manuellement." + +#~ msgid "football" +#~ msgstr "football américain" + +#~ msgid "Football" +#~ msgstr "Football américain" #~ msgid "Move" Index: /applications/editors/josm/i18n/po/gl.po =================================================================== --- /applications/editors/josm/i18n/po/gl.po (revision 22208) +++ /applications/editors/josm/i18n/po/gl.po (revision 22209) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" "PO-Revision-Date: 2010-06-15 17:32+0000\n" "Last-Translator: Dario \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:54+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:11+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -244,5 +244,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -250,6 +250,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -336,8 +336,7 @@ msgstr "Non hai capas escollidas" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Engadir Nodo..." @@ -661,5 +660,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1045,5 +1044,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1052,5 +1051,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1190,4 +1189,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Mover Nodo..." @@ -1490,6 +1490,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1712,6 +1712,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2356,5 +2354,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2602,10 +2600,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Buscar..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Buscar obxectos." @@ -2613,65 +2611,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Por favor introduce un filtro para a cadea" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Por favor, introduce unha cadea de busca." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Introduce a expresion de búsqueda" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "reemplazar selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "engadir á selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "eliminar da selección" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "buscar a seleccion" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "sensible a maiúsculas" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "expresión regular" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "Baker Street - ''Baker'' e ''Street'' en calquer clave ou nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "\"Baker Street\" - ''Baker Street'' en calquera clave ou nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak - ''Bak'' en calquer posición do nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - a clave ''type'' co valor exacto ''route''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2681,39 +2679,39 @@ "b>, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - que non conteña ''Bak'' no nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "¿sentido único? - oneway=yes, true, 1 o on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - clave=foot establecida con calquer valor." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Obxectivos especiais:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" msgstr "type: - tipo do obxecto(node,way,relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - todos os obxectos cambiados polo usuario" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" "usuario:anonimo- todos os obxectos cambiados por usuarios anónimos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:...- obxecto co ID dado (0 para novos obxectos)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2723,5 +2721,5 @@ "asignada)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2731,5 +2729,5 @@ "cambios dado (0 obxectos sen un conxunto de cambios asignado)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2739,5 +2737,5 @@ "min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2747,9 +2745,9 @@ "contadas ou etiquetas:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2759,21 +2757,21 @@ "12T14:51:09Z, 2009-11-12 or T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - todos os obxectos cambiados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - todos os obxectos seleccionados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - todos os obxectos incompletos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - todos os obxectos sen etiquetar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2782,5 +2780,5 @@ "coa expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2789,9 +2787,9 @@ "expresión" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "Usar | ou OR para combinar co operador OU lóxico" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2799,5 +2797,5 @@ ")" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2807,12 +2805,12 @@ "precedidos por \\ (p.ex. \\\" and \\\\)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Usar ( e ) para agrupar expresións" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2821,38 +2819,51 @@ msgstr "Filtrar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Enviar filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Comezar Busca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Introduce a expresion de búsqueda" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Non se atoparon coincidencias para \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Non se engadiu nada á selección buscando por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Non se eliminou da selección buscando por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Nada atopado na seleccion buscando por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2860,5 +2871,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2866,5 +2877,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2872,5 +2883,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2878,5 +2889,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -3012,8 +3023,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3156,5 +3167,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3284,11 +3295,11 @@ msgstr[1] "Mover {0} nodos" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Obxecto \"{0}\" purgado" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3297,5 +3308,5 @@ msgstr[1] "Pugados {0} obxectos" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3306,5 +3317,5 @@ "2. Os actuais son {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3342,5 +3353,5 @@ msgstr "Resolver {0} conflictos de etiquetado na relación {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3683,6 +3694,6 @@ "é un erro crítico, deberia ser seguro continuar no teu choio." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3692,10 +3703,10 @@ msgstr "Non se atopou obxectivo para misturar a via con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Non se atopou obxectivo para misturar o obxecto con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3703,5 +3714,5 @@ msgstr "Non se atopou obxectivo para misturar o nodo con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3710,5 +3721,5 @@ msgstr "Non se atopou obxectivo para misturar a relación con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3717,79 +3728,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "Non se atopa o obxectivo a misturar do tipo {0} con id {1}" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "E" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "H" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "texto" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "R" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "A" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "D" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "F" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

Filtro Activo

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0}obxectos agochados" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "{0} obxectos deshabilitados" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "" -"

Pechar o diálogo de filtrado para ver todos os obxectos.

" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3929,5 +3865,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "fondo" @@ -4055,12 +3991,10 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (Francia)" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "UTM20 sistema geodesico del norte" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4103,5 +4037,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "Vía férrea" @@ -4122,7 +4056,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4189,7 +4123,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "construcción" @@ -4278,5 +4212,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4507,5 +4441,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4822,12 +4756,12 @@ msgstr "A regra {0} non está a participar na comparación do par {1}." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Propiedades" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4838,6 +4772,6 @@ msgstr "Etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4845,6 +4779,6 @@ msgstr "Nodos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4852,9 +4786,9 @@ msgstr "Membros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Ningún conflicto de etiquetas pendente de ser resolto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4863,5 +4797,5 @@ msgstr[1] "Etiquetas({0} conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4870,9 +4804,9 @@ msgstr[1] "{0} etiquetas pendentes de resolver conflictos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Nodos(resolto)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4881,17 +4815,17 @@ "nodos desta vía" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Nodos(con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Conflictos pendentes na lista de nodos desta vía" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Membros(resolto)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4901,25 +4835,25 @@ "de nodos desta relación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Membros (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Conflictos pendentes na lista de membros desta relación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Ningún conflicto de propiedades pendente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Propiedades(con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Conflictos de propiedades pendentes de resolver" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Resolución de conflitos" @@ -4969,5 +4903,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "A miña versión" @@ -4980,5 +4914,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4994,5 +4928,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "A súa versión" @@ -5071,5 +5005,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -5081,5 +5015,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Abaixo" @@ -5186,70 +5120,9 @@ "comando de resolución." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" -"Ocurriu un erro mentres se comunicaba co servidor
Detalles: {0} " - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Comunicación fallida co servidor" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Si, desfacer o borrado de eles tamén" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "Non, cancelar a operación" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -"Hai {0} nodo adicional usado pola vía {1}
que foi eliminado no servidor." -"

Quere que ese nodo volva a existir?" -msgstr[1] "" -"Hai {0} nodos adicionais usados pola vía {1}
que foron eliminados no " -"servidor.

Quere que eses nodos volvan a existir?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Desfacer o borrado de nodos adicionais?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -"Hay {0} primitiva adicional referida na relación a {1}
a cal está borrada " -"no servidor.

Desexa recuperala tamén?" -msgstr[1] "" -"Hay {0} primitivas adicionais referidas nas relacións a {1}
as cales " -"están borradas no servidor.

Desexa recuperalas tamén?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Desfacer o borrado de primitivas dependentes?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Propiedades do meu conxunto de datos, p.e. o conxunto de datos local" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5259,127 +5132,60 @@ "elementos cando se apliquen as decisións de misturar." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" "Propiedades no seu conxunto de datos, p.ex. o conxunto de cambios do servidor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Coordenadas:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Estado borrado:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Estado visible:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "Referenciado por:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(ningún)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "borrado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "non borrado" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "visible (no servidor)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "non visible (no servidor)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Manter unha copia da versión local" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Eliminar fisicamente do conxunto de cambios local" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Mantener as miñas coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Mantener as suas coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "Conflicto sen resolver entre diferentes coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "Manter o meu estado de borrado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "Manter o seu estado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "Conflicto indecidido entre estados de borrado" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "Manter o meu estado visible" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Sí, reiniciar o id" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "Reiniciar o id a 0" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Mantener o seu estado visible" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Sí, purgalo" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM terá que borrar a túa primitiva local con id {0}
do conxunto " -"de datos.
Esta de acordo?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Eliminar do conxunto de datos" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "Conflicto entre estados visibles sen resolver" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5529,5 +5335,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "todo" @@ -5608,7 +5414,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5618,6 +5424,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5831,5 +5637,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5889,25 +5695,25 @@ msgstr "Escoller no mapa os elementos escollidoss na lista superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Cancelar a resolución de conflictos e pechar o cadro de diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Aplicar os conflictos resoltos e pechar o diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Aplicar resolución" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Pechar de todos modos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Continuar resolvendo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5925,22 +5731,22 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "Conflicto non resolto completamente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Resolver conflictos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Resolver conflictos de ''{0}'" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Filtrar obxectos e agochaos/desactivaos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5953,44 +5759,124 @@ msgstr "Engadir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "Engadir filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Editar filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Borrar filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Subir filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Baixar filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Activar filtro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Ocultar elementos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Invertir filtro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Modo de filtro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "Filtro Agochado:{0} Desactivado:{1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Erro cargando ficheiro" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "E" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "H" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "texto" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "R" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "A" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "D" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

Filtro Activo

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0}obxectos agochados" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "{0} obxectos deshabilitados" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "" +"

Pechar o diálogo de filtrado para ver todos os obxectos.

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -6033,37 +5919,37 @@ msgstr "Información do obxecto avanzada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Introducir as coordenadas para o novo nodo." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Usar grados decimais." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valores negativos indican que é o hemisferio Oeste/Sur." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Por favor escolle unha latitude válida, no rango -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Por favor introduce unha latitude no rango de -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Por favor escolle unha latitude válida, no rango -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Por favor escolle unha latitude válida no rango -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Pecha o diálogo e crea un novo nodo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Pecha o diálogo,non crear un novo nodo" @@ -6123,5 +6009,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relacións" @@ -6169,10 +6055,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "Descargar membros incompletos das relacións escollidas" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "Descargar membros incompletos" @@ -6236,14 +6122,14 @@ msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Selección: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "Conseguir información detallada do estado interno dos obxectos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "Inspeccionar" @@ -6957,8 +6843,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6983,6 +6877,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7365,69 +7257,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Nome" @@ -8034,5 +7927,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8675,8 +8568,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "" @@ -8705,6 +8598,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "descoñecido" @@ -9042,5 +8935,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Detectaronse conflictos" @@ -9563,4 +9456,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -10060,5 +9954,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "" @@ -10109,5 +10003,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10186,23 +10080,23 @@ "correctamente os seus tempos foron omitidos." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Capa de datos {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "fora da área descargada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10211,34 +10105,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10247,32 +10118,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} composto de:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Convertir a capa GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -13229,4 +13100,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14749,5 +14621,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15018,5 +14890,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "" @@ -15451,36 +15323,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Convertir a un multipolígono" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "enderezo" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Crear unha nova relación" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Construccións" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Número" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Seguinte" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Enderezos" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15642,10 +15515,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15700,7 +15577,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15709,13 +15586,13 @@ msgstr "auga" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "símbolo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "parcela" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "numero de parcela" @@ -15763,32 +15640,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "enderezo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "localidade" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "sección" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "común" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Activar caché automática." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Tamaño da caché max. (En MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15800,18 +15677,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "Catastro francés WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Fonte" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15821,5 +15698,5 @@ "preferencias de JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15827,9 +15704,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Permitir varias capas apiladas" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -15837,115 +15714,115 @@ "transparente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Dibuxa un rectángulo arredort dos datos descargados do servidor WMS" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "Resolución da Imaxe:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "Alta resolución(1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "Media resolución (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "Baixa resolución(600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "Interpolación do filtro de imaxe:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "Bilinear (rapido)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "Bicúbico (lento)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -15953,8 +15830,12 @@ "tamaño" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16255,5 +16136,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -16264,14 +16145,14 @@ "Crear unha nova." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "" @@ -17535,4 +17416,26 @@ msgstr "Arrastr para escalar a imaxe no eixe Y" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +#, fuzzy +msgid "Create Stops from GTFS ..." +msgstr "Crear paradas desde GPX..." + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +#, fuzzy +msgid "Create Stops from a GTFS file" +msgstr "Crear paradas desde un arquivo GPX" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "IOException \"{0}\" Ocurriu" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +#, fuzzy +msgid "GTFS-Stops" +msgstr "Paradas" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17574,9 +17477,4 @@ msgid "Create Stops from a GPX file" msgstr "Crear paradas desde un arquivo GPX" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" -msgstr "IOException \"{0}\" Ocurriu" #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83 @@ -19078,5 +18976,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "" @@ -19264,5 +19162,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "" @@ -19782,5 +19680,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "" @@ -19823,34 +19721,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Anotacións" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19873,7 +19774,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Introduce o teu comentario" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20786,7 +20686,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Abrir un ficheiro." +msgstr "" #. Strings in JFileChooser @@ -21069,7 +20968,14 @@ msgstr "Complemento para desfacer conxuntos de cambios" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21081,10 +20987,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Proporciona capacidades de enrutamento." #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21093,5 +20999,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21100,15 +21006,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Permite engadir marcadores/nodos ás posicións GPS actuais." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21118,10 +21024,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21130,5 +21036,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21137,5 +21043,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21146,10 +21052,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "Permite desfacer o borrado de obxetos da base de datos de OSM" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21160,5 +21066,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21168,5 +21074,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21177,5 +21083,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -21183,10 +21089,10 @@ #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21197,5 +21103,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21328,5 +21234,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Referencia" @@ -21865,5 +21771,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "metal" @@ -21876,5 +21782,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "bosque" @@ -22179,8 +22085,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "si" @@ -22291,8 +22197,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "non" @@ -22598,5 +22504,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "vía de servicio" @@ -22716,5 +22622,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "senda" @@ -22863,4 +22769,9 @@ msgid "Edit Motorway Junction" msgstr "Editar saída de autopista" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Número" #. item "Waypoints/Motorway Junction" text "Number" @@ -22913,13 +22824,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operador/a" @@ -23187,6 +23098,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Elevación" @@ -24038,5 +23949,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Voltaxe" @@ -24407,24 +24318,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Horario de apertura" @@ -24491,23 +24402,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24/7" @@ -24521,23 +24432,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "Lu-Vie 08:30-20:00" @@ -24551,23 +24462,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00" @@ -24681,6 +24592,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Número de referencia" @@ -24696,5 +24607,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "subterráneo" @@ -24708,5 +24619,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "De pago" @@ -24882,5 +24793,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Cadeira de rodas" @@ -24918,5 +24829,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Refuxio" @@ -24924,5 +24835,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Banco" @@ -25041,5 +24952,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Baliza" @@ -25778,5 +25689,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Deportes" @@ -25851,5 +25762,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25963,12 +25922,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26035,12 +25986,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26054,12 +25997,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -26221,5 +26156,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "deporte" @@ -26246,4 +26182,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "fútbol australiano" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "fútbol australiano" @@ -26271,4 +26213,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "fútbol australiano" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "piragua" @@ -26311,6 +26259,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "fútbol" +#, fuzzy +msgid "gaelic_football" +msgstr "fútbol australiano" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26351,5 +26300,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "rugby" @@ -26470,6 +26425,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26483,5 +26442,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26503,4 +26461,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "tipo" @@ -26524,6 +26484,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26536,5 +26500,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26556,4 +26519,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "cancha de xogo" @@ -26576,4 +26541,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "Polideportivo" @@ -26596,4 +26563,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "Estadio" @@ -26616,4 +26585,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "pista" @@ -26815,158 +26786,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Fútbol americano" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Editar fútbol americano" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Fútbol australiano" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Editar fútbol australiano" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Fútbol australiano" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Editar fútbol australiano" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Editar fútbol americano" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Editar fútbol australiano" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Editar fútbol americano" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Editar fútbol americano" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Editar rugby" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Editar rugby" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Béisbol" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Editar béisbol" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Baloncesto" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Editar baloncesto" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Editar golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "campo de golf" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Editar boule" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Bolos" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Editar bolos" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Críket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Edit críket" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Críket con redes" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Editar críket con redes" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Editar croquet" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Editar hockey" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelota vasca" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Editar pelota vasca" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Raqueta" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Editar raqueta" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Editar rugby" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Ténis de mesa" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Editar tenis de mesa" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tenis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Editar tenis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Artificial" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Edificio" @@ -26974,5 +26981,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Edificio público" @@ -26980,10 +26987,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Editar edificio público" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Casa do Concello" @@ -26991,10 +26998,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Editar Casa do Concello" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Embaixada" @@ -27002,10 +27009,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Editar Embaixada" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Xuzgado" @@ -27014,10 +27021,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Editar xuzgado" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Prisión" @@ -27026,10 +27033,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Editar prisión" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Policía" @@ -27039,10 +27046,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Editar policía" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Parque de bombeiros" @@ -27051,10 +27058,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Editar parque de bombeiros" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Oficina postal" @@ -27062,5 +27069,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Editar oficina postal" @@ -27068,15 +27075,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Xardín de infancia" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Editar Xardín de infancia" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Escola" @@ -27084,10 +27091,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Editar escola" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Universidade" @@ -27095,10 +27102,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Editar universidade" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Instituto" @@ -27106,5 +27113,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Editar instituto" @@ -27112,5 +27119,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Cine" @@ -27119,10 +27126,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Editar cine" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Biblioteca" @@ -27131,9 +27138,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Editar biblioteca" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Centro de arte" @@ -27141,10 +27148,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Editar centro de arte" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Teatro" @@ -27153,10 +27160,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Editar teatro" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Lugar de culto" @@ -27166,5 +27173,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Editar lugar de culto" @@ -27173,6 +27180,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Relixión" @@ -27181,66 +27188,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "bahaísta" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "budista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "cristian" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hindú" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "jainista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "xudía" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "musulmá" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sijista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "espiritualista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "unitarismo" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zoroástrica" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Denominación" @@ -27249,81 +27256,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglicano" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptista" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "católico" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "evanxélico" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "testigos de Xenoveva" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "luterano" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "metodista" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormón" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "ortodoxo" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "presbiteriano" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestante" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "cuáquero" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "chiita" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "suní" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Enderezos" @@ -27332,5 +27339,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Editar enderezos" @@ -27338,5 +27345,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Número de casa" @@ -27344,25 +27351,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Nome da casa" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Nome da rúa" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Nome da cidade" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Código postal" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Código do país" @@ -27371,5 +27378,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Editar interpolación de direccións" @@ -27377,61 +27384,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Esquema numérico" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "impares" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "pares" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "alfabético" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Feito polo home" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Fábrica" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Editar fábrica" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Torre" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Editar torre" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "Tipo de torre" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "comunicación" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "observación" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Altura (en metros)" @@ -27439,25 +27446,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Torre de auga" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Editar torre de agua" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Gasómetro" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Editar gasómetro" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Faro" @@ -27465,10 +27472,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Editar faro" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Muíño de vento" @@ -27476,10 +27483,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Editar muíño de vento" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Tubería" @@ -27488,41 +27495,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Editar tubería" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "gas" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "térmico" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "aceite" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "augas residuais" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "calquer substancia" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Localización" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "sumerxido" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "na superficie" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Depuradora" @@ -27532,10 +27539,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Editar depuradora" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Grúa" @@ -27543,5 +27550,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Editar grúa" @@ -27549,10 +27556,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Editar baliza" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Vértice xeodésico" @@ -27560,10 +27567,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Editar vértice xeodésico" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Cámara de vixilancia" @@ -27571,23 +27578,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Editar cámara de vixilancia" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "interiores" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "exteriores" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "público" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Xerador de enerxía" @@ -27597,35 +27604,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Editar Xerador de Enerxía" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "vento" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "hidráulico" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fósil" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "carbón" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "fotovoltaico" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Central eléctrica" @@ -27634,10 +27641,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Editar central eléctrica" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Subestación eléctrica" @@ -27646,5 +27653,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Editar subestación eléctrica" @@ -27652,10 +27659,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Liña de referencia" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Torre de electricidade" @@ -27666,23 +27673,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Editar torre de electricidade" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "torre" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "poste" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "Referencia da torre" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Tendido eléctrico" @@ -27691,74 +27698,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Editar tendido eléctrico" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Tipo de liña" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "liña" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "baixa tensión" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Cantidade de cables" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Número de arames (mellor:conductores) por cable de tensión" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "sinxelo" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "dobre" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "triple" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "cuadruple" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Servizos" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Baños" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "limitado" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Nota" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Buzón de Correos" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Teléfono" @@ -27767,5 +27774,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Editar teléfono" @@ -27773,5 +27780,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Moedas" @@ -27779,5 +27786,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Anotacións" @@ -27785,5 +27792,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Tarxeta de recarga e moedeitos electrónicos" @@ -27791,5 +27798,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Tarxetas de débito" @@ -27797,15 +27804,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Tarxetas de crédito" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Tarxetas telefónicas" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Reciclaxe" @@ -27814,5 +27821,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Editar punto limpo" @@ -27820,35 +27827,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Baterías" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Latas" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Roupas" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Vidro" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Papel" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Chatarra" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "Papeleiras" @@ -27856,5 +27863,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Editar papeleiras" @@ -27863,31 +27870,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "Respaldo" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Material" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "pedra" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "plástico" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Cor" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "negro" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "marrón" @@ -27966,5 +27973,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27974,31 +27981,31 @@ msgstr "verde" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "vermello" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "azul" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "gris" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "branco" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Numero de asentos" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Apostadeiro de caza" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Editar apostadeiro de caza" @@ -28007,30 +28014,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Alto" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "baixa" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "media" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "total" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Agochar" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Bloquear" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Fonte" @@ -28039,10 +28046,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Editar fonte" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Auga potable" @@ -28051,10 +28058,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Editar auga potable" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Hidrante contra incendios" @@ -28063,5 +28070,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Editar hidrante contra incendios" @@ -28069,5 +28076,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Caixa temperada" @@ -28075,15 +28082,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Editar caixa temperada" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Tendas" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Concesionario de automóviles" @@ -28091,10 +28098,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Editar concesionario de automóviles" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Tenda de bicicletas" @@ -28103,28 +28110,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Editar tenda de bicicletas" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermercado" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Editar supermercado" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Farmacia" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Editar farmacia" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Tenda de alimentación" @@ -28132,9 +28139,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Editar tenda de alimentación" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Quiosco" @@ -28142,27 +28149,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Editar quiosco" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Librería" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Editar librería" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Axencia de viaxes" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Editar axencia de viaxes" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Carnicería" @@ -28170,9 +28177,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Editar carnicería" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Panadeiro" @@ -28180,9 +28187,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Editar panadeiro" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Floristería" @@ -28190,18 +28197,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Editar floristería" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Orgánico" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Editar tenda de productos orgánicos" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Tenda de bebidas alcohólicas" @@ -28209,54 +28216,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Editar tenda de bebidas alcohólicas" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Brebaxes" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Editar tenda de brebaxes" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Ordenador" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Editar tenda de ordenadores" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Electrónica" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Editar tenda de electrónica" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Editar tenda HIfi" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Mobles" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Editar Moblería" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Centro de xardinería" @@ -28264,9 +28271,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Editar centro de xardinería" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Ferretería" @@ -28274,9 +28281,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Editar ferretería" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Almacén de bricolaxe" @@ -28284,54 +28291,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Editar almacén de bricolaxe" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Papelería" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Editar papelería" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Perruqueria" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Editar perruquería" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Zapatos" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Editar zapatería" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Xoguetes" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Editar Xoguetería" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Vídeo" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Editar tenda de vídeos" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Tintorería" @@ -28339,9 +28346,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Editar tintorería" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Lavandería" @@ -28349,9 +28356,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Editar Lavandería" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Exteriores" @@ -28359,24 +28366,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Editar tenda de exteriores" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Editar tenda de materiais deportivos" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Óptica" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Editar óptica" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Máquina expendedora" @@ -28384,5 +28391,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Editar máquina expendedora" @@ -28390,97 +28397,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Expendedor automático de productos" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "Billetes de transporte público" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "Bonos de transporte público" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "Tickets de aparcamento" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "Alimentación" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "Bebidas" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "doces" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "Estanco" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "Fotos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "comida para animais" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "Xornáis" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "xoguetes" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "selos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "Tarxetas SIM" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "Tarxetas telefónicas" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "Bonos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "tubo_de_bicicleta" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "gomas do pito" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tampóns" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "Bolsas para excrementos" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "Tarxetas de afidelización ou de desconto" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Cartos en efectivo" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Banco" @@ -28488,14 +28495,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Editar banco" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Caixeiro automático" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Cambio de moeda" @@ -28503,5 +28510,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Editar cambio de moeda" @@ -28509,15 +28516,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Editar Caixeiro" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Saúde" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Médicos" @@ -28525,18 +28532,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Editar médicos" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Dentista" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Editar dentista" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Farmacia" @@ -28544,5 +28551,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Editar farmacia" @@ -28550,9 +28557,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Expende baixo receta médica" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Hospital" @@ -28560,10 +28567,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Editar hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Punto de acceso para emerxencias" @@ -28572,5 +28579,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Editar punto de acceso para emerxencias" @@ -28579,20 +28586,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Número do punto" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Nome do Punto" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Número de teléfono" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Utilizar código internacional, como +12-345-67890)" @@ -28600,5 +28607,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Veterinario" @@ -28607,64 +28614,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Editar veterinario" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Xeografía" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Lugares" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Continente" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Editar continente" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "País" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Editar país" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Estado" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Editar estado" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Rexión" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Editar rexión" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "País" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Editar país" @@ -28672,15 +28679,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Cidade" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Editar cidade" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Vila" @@ -28688,10 +28695,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Editar Vila" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Suburbio" @@ -28699,25 +28706,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Editar suburbio" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Poboación" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Editar poboación" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Aldea" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Editar aldea" @@ -28725,5 +28732,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Localidade" @@ -28731,10 +28738,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Editar Localidade" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Illa" @@ -28742,10 +28749,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Editar Illa" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Illote" @@ -28753,5 +28760,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Editar Illote" @@ -28759,5 +28766,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Entrada de cova" @@ -28765,10 +28772,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Editar entrada de cova" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Pico" @@ -28776,10 +28783,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Editar pico" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Glaciar" @@ -28787,10 +28794,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Editar glaciar" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Volcán" @@ -28798,70 +28805,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Editar volcán" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Fronteiras" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Nacional" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Editar fronteira nacional" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Administrativo" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Editar fronteira administrativa" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Civil" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Editar fronteira civil" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Política" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Editar fronteira política" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Parque Nacional" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Editar límites do parque nacional" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Uso do chan" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Árbore" @@ -28870,15 +28877,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Editar árbore" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Nome botánico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Madeira" @@ -28887,5 +28894,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Editar bosque" @@ -28893,17 +28900,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "conífera" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "decíduos" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "mixto" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Monte" @@ -28912,14 +28919,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Editar zona forestal" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Reserva Natural" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Editar Reserva Natural" @@ -28927,25 +28934,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Cantos" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Editar cantos" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Matorral" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Editar matorral" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Caída" @@ -28953,10 +28960,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Editar Caída" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Brezal o landa" @@ -28964,5 +28971,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Editar brezal o landa" @@ -28970,5 +28977,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Edificio agrario" @@ -28977,45 +28984,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Editar edificio agrario" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Terra de labor" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Editar o uso da terra de labor" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Prado" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Editar o uso do prado" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Viñedo" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Editar o uso do viñedo" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Área cultivábel" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "eitar o uso da área cultivábel" @@ -29023,25 +29030,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Xardín" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Editar Xardín" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Herba" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Editar o uso ta área de herba" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Parque Municipal" @@ -29049,10 +29056,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Editar parque municipal" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Común" @@ -29060,20 +29067,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Editar común" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Parque" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Editar parque" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Terra de recreo" @@ -29081,5 +29088,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Editar o uso da área de recreo" @@ -29087,15 +29094,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Área residencial" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Editar o uso da área residencial" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Camposanto (para os cementerios próximos ás igrexas)" @@ -29103,9 +29110,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Editar camposanto" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Cemiterio" @@ -29113,39 +29120,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Editar a área do cemiterio" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Comercios" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Editar comercios" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Comercial" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Editar o uso da área comercial" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Industrial" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Editar o uso da área industrial" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Via do tren" @@ -29153,15 +29160,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Editar o uso da área da via do tren" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Militar" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Editar o uso da área militar" @@ -29169,50 +29176,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Área de construcción" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Editar o uso da área en construcción" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Zona industrial abandoada" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Editar terreno abandoado" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Zona verde" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Editar zona verde" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Vertedoiro" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Editar vertedoiro" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Canteira" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Editar o uso da área da canteira" @@ -29222,5 +29229,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Editar Multipolígono" @@ -29232,5 +29239,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "segmento exterior" @@ -29238,5 +29245,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "segmento interior" @@ -29244,5 +29251,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "Límite" @@ -29253,5 +29260,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "Editar límite" @@ -29259,36 +29266,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "Tipo de límite" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "administrativo" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "nacional" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "civil" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "político" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "Nivel administrativo" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "Subárea" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "Centro de Administración" @@ -29296,5 +29303,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Restricción de xiro" @@ -29303,5 +29310,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Editar as restriccións de xiro" @@ -29309,34 +29316,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Restricción" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "non_xirar_esquerda" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "non_xirar_dereita" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "non_seguir_de_frente" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "prohibido xiro en U" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "só_xirar_dereita" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "só_xirar_esquerda" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "só_seguir_de_frente" @@ -29345,15 +29352,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "da vía" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "a través de nodo ou vía" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "á via" @@ -29361,5 +29368,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Ruta" @@ -29368,5 +29375,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Editar ruta" @@ -29374,5 +29381,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Tipo de Ruta" @@ -29480,5 +29487,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29489,17 +29496,17 @@ msgstr "bicicleta" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "camiño" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "ferry" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "ski" @@ -29567,5 +29574,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29575,9 +29582,9 @@ msgstr "pé" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "tranvía" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "desvío" @@ -29591,10 +29598,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Descición de símbolo" @@ -29602,31 +29609,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Rede" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "Ruta estatal" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "Proposto" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "alternativo" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "temporal" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "conexión" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Color (hex)" @@ -29635,30 +29642,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "segmento da ruta" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "segmento seguinte" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "segmento anterior" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "punto de detención" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "próximo punto de parada" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "anterior punto de parada" @@ -29885,5 +29892,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "obsoleto" @@ -33211,11 +33218,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "lugar" @@ -33229,5 +33236,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "datos_TIGER" @@ -33582,4 +33589,101 @@ msgid "Sicily - Italy" msgstr "Sicilia - Italia" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "Ocurriu un erro mentres se comunicaba co servidor
Detalles: {0} " +#~ "" + +#~ msgid "Communication with server failed" +#~ msgstr "Comunicación fallida co servidor" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Si, desfacer o borrado de eles tamén" + +#~ msgid "No, cancel operation" +#~ msgstr "Non, cancelar a operación" + +#~ msgid "" +#~ "There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgid_plural "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" +#~ msgstr[0] "" +#~ "Hai {0} nodo adicional usado pola vía {1}
que foi eliminado no " +#~ "servidor.

Quere que ese nodo volva a existir?" +#~ msgstr[1] "" +#~ "Hai {0} nodos adicionais usados pola vía {1}
que foron eliminados no " +#~ "servidor.

Quere que eses nodos volvan a existir?" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Desfacer o borrado de nodos adicionais?" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "Hay {0} primitiva adicional referida na relación a {1}
a cal está " +#~ "borrada no servidor.

Desexa recuperala tamén?" +#~ msgstr[1] "" +#~ "Hay {0} primitivas adicionais referidas nas relacións a {1}
as cales " +#~ "están borradas no servidor.

Desexa recuperalas tamén?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Desfacer o borrado de primitivas dependentes?" + +#~ msgid "Visible State:" +#~ msgstr "Estado visible:" + +#~ msgid "visible (on the server)" +#~ msgstr "visible (no servidor)" + +#~ msgid "not visible (on the server)" +#~ msgstr "non visible (no servidor)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Manter unha copia da versión local" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Eliminar fisicamente do conxunto de cambios local" + +#~ msgid "Keep my visible state" +#~ msgstr "Manter o meu estado visible" + +#~ msgid "Yes, reset the id" +#~ msgstr "Sí, reiniciar o id" + +#~ msgid "Reset id to 0" +#~ msgstr "Reiniciar o id a 0" + +#~ msgid "Keep their visible state" +#~ msgstr "Mantener o seu estado visible" + +#~ msgid "Yes, purge it" +#~ msgstr "Sí, purgalo" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM terá que borrar a túa primitiva local con id {0}
do " +#~ "conxunto de datos.
Esta de acordo?" + +#~ msgid "Remove from dataset" +#~ msgstr "Eliminar do conxunto de datos" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Conflicto entre estados visibles sen resolver" + +#~ msgid "football" +#~ msgstr "fútbol" + +#~ msgid "Football" +#~ msgstr "Fútbol americano" #~ msgid "Do not show again" Index: /applications/editors/josm/i18n/po/he.po =================================================================== --- /applications/editors/josm/i18n/po/he.po (revision 22208) +++ /applications/editors/josm/i18n/po/he.po (revision 22209) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-23 22:57+0000\n" -"Last-Translator: bastik \n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-28 16:34+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:54+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -241,5 +241,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -247,6 +247,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -332,8 +332,7 @@ msgstr "אין שכבות יעד" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "הוסף נקודה..." @@ -652,5 +651,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1031,5 +1030,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1038,5 +1037,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1173,4 +1172,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "הזז נקודה..." @@ -1444,6 +1444,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1663,6 +1663,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2275,5 +2273,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2510,10 +2508,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "חפש..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "חיפוש אחר פריטים." @@ -2521,65 +2519,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "נא הזן מחרוזת לחיפוש." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "החלפת הבחירה" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "הוספה לבחירה" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "הסר מהבחירה" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "רגיש להבדל בין אותיות גדולות וקטנות" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "ביטוי רגולרי" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "רחוב אבג-''רחוב'' ו''אבג'' בכל מפתח או שם." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "\"רחוב אבג\"-''רחוב אבג'' בכל מפתח או שם." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:אבג-''אבג'' איפשהו בשם." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route-מפתח ''type'' עם הערך ''route'' במדוייק." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2589,38 +2587,38 @@ "*=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:אבג-ללא ''אבג'' בשם." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot:-מפתח ''foot'' עם כל ערך." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "מטרות מיוחדות:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" msgstr "type:-סוג העצם (נקודה, דרך, יחס)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:...-כל העצמים ששונו ע\"י המשתמש" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2628,5 +2626,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2634,5 +2632,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2640,5 +2638,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2646,9 +2644,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2656,39 +2654,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified...- כל העצמים ששונו" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - כל העצמים הבחורים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - כל העצמים הבלתי גמורים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - כל העצמים הלא מתוייגים" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "השתמש ב-| או OR כדי לחבר ב\"או\" לוגי" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2696,12 +2694,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "השתמש ב-( ו ) כדי לצרף ביטויים" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2710,38 +2708,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "חפש" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "התחל חיפוש" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "ביטוי רגולרי" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "לא נמצאה התאמה עבור \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "דבר לא הורד מהבחירה ע\"י חיפוש \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2749,5 +2760,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2755,5 +2766,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2761,5 +2772,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2767,5 +2778,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2889,8 +2900,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3029,5 +3040,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3153,11 +3164,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3166,5 +3177,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3173,5 +3184,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3209,5 +3220,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3516,6 +3527,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3525,10 +3536,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3536,5 +3547,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3543,5 +3554,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3549,78 +3560,4 @@ #, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "טקסט" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -3752,5 +3689,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "רקע" @@ -3920,5 +3857,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "מסילת רכבת" @@ -3939,7 +3876,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4006,7 +3943,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "בניין" @@ -4095,5 +4032,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4316,5 +4253,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4613,12 +4550,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "תכונות" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4629,6 +4566,6 @@ msgstr "תוויות" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4636,6 +4573,6 @@ msgstr "נקודות" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4643,9 +4580,9 @@ msgstr "חברים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4654,5 +4591,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4661,26 +4598,26 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "נקודות (פתורות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "נקודות (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "חברים (פתורים)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4688,25 +4625,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "חברים (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "תכונות (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "פתרון התנגשות" @@ -4752,5 +4689,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "הגירסה שלי" @@ -4761,5 +4698,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4773,5 +4710,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "הגירסה שלהם" @@ -4848,5 +4785,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4858,5 +4795,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "מטה" @@ -4955,60 +4892,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "כן, בטל גם את המחיקה שלהם" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "לא, בטל את הפעולה" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "בטל מחיקת נקודות נוספות?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5016,123 +4902,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "קואורדינטות:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(לא כלום)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "מחוק" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "לא נמחק" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "שמור את הקואורדינטות שלי" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "שמור את הקואורדינטות שלהם" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" msgstr "" @@ -5280,5 +5101,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "הכל" @@ -5358,7 +5179,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5368,6 +5189,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5553,5 +5374,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5607,25 +5428,25 @@ msgstr "הגדר את הפריטים הנבחרים שעל המפה לפריטים הנבחרים ברשימה שלהלן." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "בטל את פתרון ההתנגשות וסגור את הדיאלוג" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 msgid "Apply Resolution" msgstr "החל פתרון" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 msgid "Continue resolving" msgstr "המשך לפתור" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5637,22 +5458,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "פתור התנגשויות" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5665,43 +5486,122 @@ msgstr "הוסף" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 +msgid "Enable filter" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 +msgid "Hide elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 -msgid "Enable filter" +msgid "Inverse filter" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 -msgid "Hide elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 -msgid "Inverse filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 msgid "Filter mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "שגיאה בטעינת קובץ" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "טקסט" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5744,37 +5644,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "הכנס את הקורדינטות של הנקודה החדשה." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "השתמש במעלות עשרוניות." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "ערכים שליליים מציינים חצי כדור מערבי\\דרומי." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "" @@ -5834,5 +5734,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "יחסים" @@ -5880,10 +5780,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -5947,14 +5847,14 @@ msgstr "בחר: יחסים:{0} \\ דרכים: {1} \\ נקודות: {2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "בחירה: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6655,8 +6555,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6681,6 +6589,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7063,69 +6969,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "שם" @@ -7703,5 +7610,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8339,8 +8246,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "סוג" @@ -8369,6 +8276,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "לא ידוע" @@ -8689,5 +8596,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "" @@ -9205,4 +9112,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9702,5 +9610,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "תיאור" @@ -9751,5 +9659,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -9826,23 +9734,23 @@ "באופן הגיוני הושמטו." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "שכבת נתונים {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "מחוץ לשטח שהורד" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "גירסה {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9851,34 +9759,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -9887,32 +9772,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} מורכב מ-:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "גירסת API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "המר לשכבת GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -12826,4 +12711,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14273,5 +14159,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14540,5 +14426,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "" @@ -14972,36 +14858,36 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 +msgid "on polygon" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "כתובת" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "צור יחס חדש" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "מבנים" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "מספר" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "הבאה" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "כתובות" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15155,10 +15041,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15213,7 +15103,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15222,13 +15112,13 @@ msgstr "מים" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15276,32 +15166,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "כתובת" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15313,18 +15203,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "מקור" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15332,5 +15222,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15338,130 +15228,134 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15762,5 +15656,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -15769,14 +15663,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "" @@ -17038,4 +16932,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17076,9 +16989,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -18582,5 +18490,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "אחר" @@ -18766,5 +18674,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "" @@ -19283,5 +19191,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "שטח" @@ -19324,34 +19232,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "ללא תמונה" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19374,7 +19285,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "דרכים ללא תוויות" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20287,7 +20197,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "פתח קובץ." +msgstr "" #. Strings in JFileChooser @@ -20569,7 +20478,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20578,10 +20494,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20590,5 +20506,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20597,15 +20513,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20615,10 +20531,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20627,5 +20543,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20634,5 +20550,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20641,10 +20557,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20653,5 +20569,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20661,5 +20577,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20668,15 +20584,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20685,5 +20601,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -20816,5 +20732,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "התייחסות" @@ -21353,5 +21269,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "" @@ -21364,5 +21280,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "" @@ -21667,8 +21583,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "כן" @@ -21779,8 +21695,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "לא" @@ -22086,5 +22002,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "שירות" @@ -22204,5 +22120,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "" @@ -22351,4 +22267,9 @@ msgid "Edit Motorway Junction" msgstr "" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "מספר" #. item "Waypoints/Motorway Junction" text "Number" @@ -22401,13 +22322,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "מפעיל" @@ -22675,6 +22596,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "הגבהה" @@ -23526,5 +23447,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "" @@ -23895,24 +23816,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "שעות פתיחה" @@ -23979,23 +23900,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "" @@ -24009,23 +23930,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "" @@ -24039,23 +23960,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -24169,6 +24090,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "" @@ -24184,5 +24105,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "" @@ -24196,5 +24117,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "" @@ -24370,5 +24291,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "" @@ -24406,5 +24327,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "מקלט" @@ -24412,5 +24333,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "ספסל" @@ -24529,5 +24450,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "" @@ -25266,5 +25187,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "" @@ -25339,5 +25260,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25451,12 +25420,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25523,12 +25484,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25542,12 +25495,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -25709,5 +25654,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "ספורט" @@ -25734,4 +25680,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "כדורגל אוסטרלי" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "כדורגל אוסטרלי" @@ -25759,4 +25711,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "כדורגל אוסטרלי" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "קנו" @@ -25799,6 +25757,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "כדורגל אמריקאי" +#, fuzzy +msgid "gaelic_football" +msgstr "כדורגל אוסטרלי" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -25839,5 +25798,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "רוגבי" @@ -25958,6 +25923,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -25971,5 +25940,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -25991,4 +25959,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "סוג" @@ -26012,6 +25982,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26024,5 +25998,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26044,4 +26017,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "" @@ -26064,4 +26039,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "מרכז ספורט" @@ -26084,4 +26061,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "איצטדיון" @@ -26104,4 +26083,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -26303,158 +26284,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "כדורגל אמריקאי" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "ערוך כדורגל אמריקאי" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "כדורגל אוסטרלי" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "ערוך כדורגל אוסטרלי" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "כדורגל אוסטרלי" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "ערוך כדורגל אוסטרלי" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "ערוך כדורגל אמריקאי" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "ערוך כדורגל אוסטרלי" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "ערוך כדורגל אמריקאי" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "ערוך כדורגל אמריקאי" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "ערוך רוגבי" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "רוגבי" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "ערוך רוגבי" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "כדור בסיס" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "ערוך כדור בסיס" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "כדורסל" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "ערוך כדורסל" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "גולף" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "ערוך גולף" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "מגרש גולף" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "כדורת דשא" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "ערוך כדורת דשא" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "הוקי" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "ערוך הוקי" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "רוגבי" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "ערוך רוגבי" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "טניס שולחן" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "ערוך טניס שולחן" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "טניס" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "ערוך טניס" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "מבנה" @@ -26462,5 +26479,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "מבנה ציבור" @@ -26468,10 +26485,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "ערוך מבנה ציבור" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "בניין העירייה" @@ -26479,10 +26496,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "ערוך בניין העירייה" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "שגרירות" @@ -26490,10 +26507,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "ערוך שגרירות" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "בית משפט" @@ -26502,10 +26519,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "ערוך בית משפט" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "כלא" @@ -26514,10 +26531,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "ערוך כלא" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "משטרה" @@ -26527,10 +26544,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "ערוך משטרה" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "תחנת מכבי אש" @@ -26539,10 +26556,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "ערוך תחנת מכבי אש" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "דואר" @@ -26550,5 +26567,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "ערוך דואר" @@ -26556,15 +26573,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "גן ילדים" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "ערוך גן ילדים" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "בית ספר" @@ -26572,10 +26589,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "ערוך בית ספר" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "אוניברסיטה" @@ -26583,10 +26600,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "ערוך אוניברסיטה" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "מכללה" @@ -26594,5 +26611,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "ערוך מכללה" @@ -26600,5 +26617,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "קולנוע" @@ -26607,10 +26624,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "ערוך קולנוע" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "ספרייה" @@ -26619,9 +26636,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "ערוך ספרייה" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "מרכז אומנויות" @@ -26629,10 +26646,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "ערוך מרכז אומנויות" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "תיאטרון" @@ -26641,10 +26658,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "ערוך תיאטרון" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "מקום תפילה" @@ -26654,5 +26671,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "ערוך מקום תפילה" @@ -26661,6 +26678,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "דת" @@ -26669,66 +26686,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "בהאי" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "בודהיסט" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "נוצרי" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "הינדי" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "יהודי" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "מוסלמי" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "סיקי" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "ספיריטואליסט" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "טאואיסט" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "" @@ -26737,81 +26754,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "אנגליקני" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "באפטיסט" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "קתולי" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "לותרני" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "מתודיסט" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "מורמוני" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "אורתודוקסי" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "פרוטסטנטי" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "שיעי" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "סוני" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "כתובות" @@ -26820,5 +26837,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "ערוך כתובת" @@ -26826,5 +26843,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "מספר בית" @@ -26832,25 +26849,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "שם בית" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "שם רחוב" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "שם עיר" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "מיקוד" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "קוד מדינה" @@ -26859,5 +26876,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "" @@ -26865,61 +26882,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "סכמת מספור" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "אי-זוגי" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "זוגי" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "מעשה אדם" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "מגדל" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "ערוך מגדל" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "" @@ -26927,25 +26944,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "מגדל מים" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "ערוך מגדל מים" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "מגדלור" @@ -26953,10 +26970,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "ערוך מגדלור" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "טחנת רוח" @@ -26964,10 +26981,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "ערוך טחנת רוח" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "צינור" @@ -26976,41 +26993,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "ערוך צינור" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "מיקום" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "" @@ -27020,10 +27037,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "" @@ -27031,5 +27048,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "" @@ -27037,10 +27054,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "" @@ -27048,10 +27065,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "" @@ -27059,23 +27076,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "" @@ -27085,35 +27102,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "תחנת כח" @@ -27122,10 +27139,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "ערוך תחנת כח" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "" @@ -27134,5 +27151,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "" @@ -27140,10 +27157,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "עמוד חשמל" @@ -27154,23 +27171,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "ערוך עמוד חשמל" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "קו מתח" @@ -27179,74 +27196,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "ערוך קו מתח" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "שירותים" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "תיבת דואר" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "טלפון" @@ -27255,5 +27272,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "ערוך טלפון" @@ -27261,5 +27278,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "" @@ -27267,5 +27284,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "" @@ -27273,5 +27290,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "" @@ -27279,5 +27296,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "" @@ -27285,15 +27302,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "כרטיסי טלפון" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "" @@ -27302,5 +27319,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "ערוך תחנת מיחזור" @@ -27308,35 +27325,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "" @@ -27344,5 +27361,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "" @@ -27351,31 +27368,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "" @@ -27454,5 +27471,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27462,31 +27479,31 @@ msgstr "ירוק" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "" @@ -27495,30 +27512,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "מזרקה" @@ -27527,10 +27544,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "ערוך מזרקה" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "מי שתיה" @@ -27539,10 +27556,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "ערוך מי שתיה" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "" @@ -27551,5 +27568,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "" @@ -27557,5 +27574,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "" @@ -27563,15 +27580,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "חנויות" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "" @@ -27579,10 +27596,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "ערוך חנות רכב" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "" @@ -27591,28 +27608,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "ערוך חנות אופניים" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "סופרמרקט" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "ערוך סופרמרקט" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "מכולת" @@ -27620,9 +27637,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "ערוך מכולת" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "קיוסק" @@ -27630,27 +27647,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "ערוך קיוסק" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "קצבייה" @@ -27658,9 +27675,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "ערוך קצבייה" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "מאפייה" @@ -27668,9 +27685,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "ערוך מאפייה" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "פרחים" @@ -27678,18 +27695,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "ערוך חנות פרחים" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "ערוך חנות אורגנית" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "" @@ -27697,54 +27714,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "ערוך חנות מחשבים" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "ערוך חנות אלקטרוניקה" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "ערוך חנות רהיטים" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "" @@ -27752,9 +27769,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "" @@ -27762,9 +27779,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "חנות עשה-זאת-בעצמך" @@ -27772,54 +27789,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "ערוך חנות עשה-זאת-בעצמך" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "מספרה" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "ערוך מספרה" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "ערוך חנות נעליים" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "ערוך חנות צעצועים" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "ערוך חנות וידאו" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "ניקוי יבש" @@ -27827,9 +27844,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "ערוך ניקוי יבש" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "מכבסה" @@ -27837,9 +27854,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "ערוך מכבסה" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "" @@ -27847,24 +27864,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "ערוך חנות ספורט" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "ערוך אופטיקאי" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "מכונת ממכר" @@ -27872,5 +27889,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "ערוך מכונת ממכר" @@ -27878,97 +27895,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "כרטיסים לתחבורה ציבורית" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "מפות תחבורה ציבורית" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "כרטיסי חניה" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "מזון" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "משקאות" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "ממתקים" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "סיגריות" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "תמונות" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "מזון בע\"ח" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "עיתונים" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "צעצועים" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "בולים" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "כרטיס SIM" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "שוברי טלפון" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "שוברים" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "קונדומים" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "טמפונים" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "שקיות צואה" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "מזומן" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "בנק" @@ -27976,14 +27993,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "ערוך בנק" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "כספומט" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "החלפת כסף" @@ -27991,5 +28008,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "ערוך החלפת כסף" @@ -27997,15 +28014,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "ערוך כספומט" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "בריאות" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "רופאים" @@ -28013,18 +28030,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "ערוך רופאים" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "רופא שיניים" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "ערוך רופא שיניים" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "בית מרקחת" @@ -28032,5 +28049,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "ערוך בית מרקחת" @@ -28038,9 +28055,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "בית חולים" @@ -28048,10 +28065,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "ערוך בית חולים" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "נקודת גישה בחירום" @@ -28060,5 +28077,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "ערוך נקודת גישה בחירום" @@ -28067,20 +28084,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "מספר נקודה" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "מספר טלפון" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(השתמש בקדומת בינלאומית, למשל +12-345-67890)" @@ -28088,5 +28105,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "וטרינרי" @@ -28095,64 +28112,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "ערוך וטרינרי" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "מקומות" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "יבשת" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "ערוך יבשת" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "ארץ" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "ערוך ארץ" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "מדינה" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "ערוך מדינה" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "אזור" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "ערוך אזור" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "מחוז" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "ערוך מחוז" @@ -28160,15 +28177,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "עיר" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "ערוך עיר" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "עיירה" @@ -28176,10 +28193,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "ערוך עיירה" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "פרבר" @@ -28187,25 +28204,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "ערוך פרבר" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "כפר" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "ערוך כפר" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "כפר קטן" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "ערוך כפר קטן" @@ -28213,5 +28230,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "מקומיות" @@ -28219,10 +28236,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "ערוך מקומיות" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "אי" @@ -28230,10 +28247,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "ערוך אי" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "" @@ -28241,5 +28258,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "" @@ -28247,5 +28264,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "פתח מערה" @@ -28253,10 +28270,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "ערוך פתח מערה" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "פסגה" @@ -28264,10 +28281,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "ערוך פסגה" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "קרחון" @@ -28275,10 +28292,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "ערוך קרחון" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "הר געש" @@ -28286,70 +28303,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "ערוך הר געש" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "גבולות" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "לאומי" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "ערוך גבול לאומי" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "מנהלי" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "ערוך גבול מנהלי" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "אזרחי" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "ערוך תחום אזרחי" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "פוליטי" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "ערוך תחום פוליטי" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "גן לאומי" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "ערוך תחום גן לאומי" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "עץ" @@ -28358,15 +28375,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "ערוך עץ" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "שם בוטני" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "חורש" @@ -28375,5 +28392,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "ערוך חורש" @@ -28381,17 +28398,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "מחטני" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "נשיר" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "מעורב" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "יער" @@ -28400,14 +28417,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "" @@ -28415,25 +28432,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "" @@ -28441,10 +28458,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "שדה-בור" @@ -28452,5 +28469,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "ערוך שדה-בור" @@ -28458,5 +28475,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "חצר משק" @@ -28465,45 +28482,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "אדמה חקלאית" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "כרם" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "" @@ -28511,25 +28528,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "דשא" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "" @@ -28537,10 +28554,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "" @@ -28548,20 +28565,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "" @@ -28569,5 +28586,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -28575,15 +28592,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "אזור מגורים" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "בית-קברות" @@ -28591,9 +28608,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "ערוך בית-קברות" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "בית עלמין" @@ -28601,39 +28618,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "קמעוני" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "מסחרי" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "תעשייתי" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "" @@ -28641,15 +28658,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "צבאי" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "" @@ -28657,50 +28674,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "אתר בניה" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "מחצבה" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "" @@ -28710,5 +28727,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "" @@ -28720,5 +28737,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "" @@ -28726,5 +28743,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "" @@ -28732,5 +28749,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -28741,5 +28758,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -28747,36 +28764,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -28784,5 +28801,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "" @@ -28791,5 +28808,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "" @@ -28797,34 +28814,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "" @@ -28833,15 +28850,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "" @@ -28849,5 +28866,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "" @@ -28856,5 +28873,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "" @@ -28862,5 +28879,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "" @@ -28968,5 +28985,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -28977,17 +28994,17 @@ msgstr "אופניים" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "אוטובוס" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "" @@ -29055,5 +29072,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29063,9 +29080,9 @@ msgstr "רגל" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "" @@ -29079,10 +29096,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "רכבת תחתית" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "" @@ -29090,31 +29107,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "" @@ -29123,30 +29140,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "" @@ -29373,5 +29390,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "מיושן" @@ -32699,11 +32716,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "מקום" @@ -32717,5 +32734,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" @@ -33071,4 +33088,19 @@ msgstr "" +#~ msgid "Yes, undelete them too" +#~ msgstr "כן, בטל גם את המחיקה שלהם" + +#~ msgid "No, cancel operation" +#~ msgstr "לא, בטל את הפעולה" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "בטל מחיקת נקודות נוספות?" + +#~ msgid "football" +#~ msgstr "כדורגל אמריקאי" + +#~ msgid "Football" +#~ msgstr "כדורגל אמריקאי" + #~ msgid "Move" #~ msgstr "הזז" Index: /applications/editors/josm/i18n/po/is.po =================================================================== --- /applications/editors/josm/i18n/po/is.po (revision 22208) +++ /applications/editors/josm/i18n/po/is.po (revision 22209) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-23 22:33+0000\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-28 16:23+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" "Language-Team: Icelandic \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:06+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -237,5 +237,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -243,6 +243,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -329,8 +329,7 @@ msgstr "" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Bæta við hnút..." @@ -652,5 +651,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1031,5 +1030,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1038,5 +1037,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1173,4 +1172,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "" @@ -1444,6 +1444,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1662,6 +1662,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2282,5 +2280,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2512,10 +2510,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Leita..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Leita að hlutum." @@ -2523,49 +2521,49 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Sláðu inn leitarstreng" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "skipta út vali" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "bæta við val" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "fjarlæga úr vali" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "stafsetursnæmt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "regluleg segð" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" @@ -2573,18 +2571,18 @@ "gildi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" "\"Gamla Hringbraut\" - „Gamla Hringbraut“ í einhverjum lykli og gildi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Gam - „Gam“ kemur fyrir í nafninu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - lykilinn „type“ með gildið „route“." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2594,21 +2592,21 @@ "*=gildi, type=, *=* og *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Gam - „Gam“ kemur ekki fyrir í nafninu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - Lykillinn „foot“ með eitthvað gildi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Sérleitir:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2617,17 +2615,17 @@ "fyrir hnút, veg og vensl" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - Hlutir sem breytt hefur verið af gefnum notanda" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - hlutur með þessa kennitölu (0 fyrir nýja hluti)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2635,5 +2633,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2641,5 +2639,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2647,5 +2645,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2653,9 +2651,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2663,39 +2661,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - Hlutum sem breytt hefur verið" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - Valdir hlutir" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - Ókláraðir hlutir" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - Hlutir án eiginda" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" msgstr "child segð - allir undirhlutir sem passa við segðina" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" msgstr "parent segð - allir yfirhlutir sem passa við segðina" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "Notaðu | eða OR t.d. „A | B“ til að leita að A eða B" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2703,12 +2701,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Notaðu ( og ) til að sameina segðir" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2717,38 +2715,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Leit" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Hefja leit" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "regluleg segð" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2756,5 +2767,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2762,5 +2773,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2768,5 +2779,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2774,5 +2785,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2895,8 +2906,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3035,5 +3046,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3160,11 +3171,11 @@ msgstr[1] "Færði {0} hnúta" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3173,5 +3184,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3180,5 +3191,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3216,5 +3227,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3523,6 +3534,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3532,10 +3543,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3543,5 +3554,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3550,5 +3561,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3556,78 +3567,4 @@ #, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -3759,5 +3696,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "bakgrunnur" @@ -3927,5 +3864,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "" @@ -3946,7 +3883,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4013,7 +3950,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "bygging" @@ -4102,5 +4039,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4317,5 +4254,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4614,12 +4551,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4630,6 +4567,6 @@ msgstr "Tögg" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4637,6 +4574,6 @@ msgstr "Hnútar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4644,9 +4581,9 @@ msgstr "Stök" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4655,5 +4592,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4662,26 +4599,26 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4689,25 +4626,25 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "" @@ -4753,5 +4690,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "" @@ -4762,5 +4699,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4774,5 +4711,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "" @@ -4841,5 +4778,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4851,5 +4788,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "" @@ -4948,60 +4885,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5009,123 +4895,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" msgstr "" @@ -5273,5 +5094,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "" @@ -5351,7 +5172,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5361,6 +5182,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5546,5 +5367,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5600,25 +5421,25 @@ msgstr "Henda hlutum út úr vallistanum sem eru ekki valdir á honum." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5630,22 +5451,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5658,43 +5479,121 @@ msgstr "Bæta við" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 +msgid "Enable filter" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 +msgid "Hide elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 -msgid "Enable filter" +msgid "Inverse filter" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 -msgid "Hide elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 -msgid "Inverse filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 msgid "Filter mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +msgid "Error in filter" +msgstr "" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5737,37 +5636,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Sláðu inn hnit fyrir nýja hnútinn." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Nota tugabrotsgráður." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Neikvæð gildi tákna vestur- og suðurhvel." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "" @@ -5827,5 +5726,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Vensl" @@ -5873,10 +5772,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -5940,14 +5839,14 @@ msgstr "Val: Hnútar:{2} / Vegir:{1} / Vensl:{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Val: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6650,8 +6549,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6676,6 +6583,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7058,69 +6963,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Heiti" @@ -7700,5 +7606,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8340,8 +8246,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Gerð" @@ -8370,6 +8276,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "óskilgreint" @@ -8690,5 +8596,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "" @@ -9208,4 +9114,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9709,5 +9616,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Lýsing" @@ -9756,5 +9663,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -9827,23 +9734,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Gagnalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "útgáfa {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9852,34 +9759,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -9888,32 +9772,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "Tölfræði um {0}:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "API útgáfa: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Breyta í GPX-lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -12822,4 +12706,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14270,5 +14155,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14537,5 +14422,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "" @@ -14969,36 +14854,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Marghyrningur" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "Heimilisfang" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Skapa ný vensl" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Byggingar" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Tilvísun" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Næsta" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Heimilisfang" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15152,10 +15038,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15210,7 +15100,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15219,13 +15109,13 @@ msgstr "vatn" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15273,32 +15163,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15310,18 +15200,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15329,5 +15219,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15335,130 +15225,134 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15759,5 +15653,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -15766,14 +15660,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "" @@ -17031,4 +16925,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17069,9 +16982,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -18571,5 +18479,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Annað" @@ -18755,5 +18663,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Marghyrningur" @@ -19270,5 +19178,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "" @@ -19311,34 +19219,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Engin mynd" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19361,7 +19272,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Vegir án eiginda" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20272,7 +20182,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Opna skrá." +msgstr "" #. Strings in JFileChooser @@ -20554,7 +20463,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20563,10 +20479,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20575,5 +20491,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20582,15 +20498,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20600,10 +20516,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20612,5 +20528,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20619,5 +20535,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20626,10 +20542,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20638,5 +20554,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20646,5 +20562,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20653,15 +20569,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20670,5 +20586,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -20801,5 +20717,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Tilvísun" @@ -21338,5 +21254,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "" @@ -21349,5 +21265,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "skógur" @@ -21652,8 +21568,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "já" @@ -21764,8 +21680,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "nei" @@ -22071,5 +21987,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "þjónustuvegur" @@ -22189,5 +22105,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "" @@ -22336,4 +22252,9 @@ msgid "Edit Motorway Junction" msgstr "" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Tilvísun" #. item "Waypoints/Motorway Junction" text "Number" @@ -22386,13 +22307,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Rekstraraðili" @@ -22660,6 +22581,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Hæð (y/s)" @@ -23511,5 +23432,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Volt" @@ -23880,24 +23801,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Opnunartími" @@ -23964,23 +23885,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "" @@ -23994,23 +23915,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "" @@ -24024,23 +23945,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -24154,6 +24075,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Tilvísun" @@ -24169,5 +24090,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "" @@ -24181,5 +24102,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "" @@ -24355,5 +24276,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "" @@ -24391,5 +24312,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Skýli" @@ -24397,5 +24318,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Bekkur" @@ -24514,5 +24435,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "" @@ -25251,5 +25172,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Íþróttir" @@ -25324,5 +25245,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25436,12 +25405,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25508,12 +25469,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25527,12 +25480,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -25694,5 +25639,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "íþrótt" @@ -25719,4 +25665,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "ástralskur fótbolti" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "ástralskur fótbolti" @@ -25744,4 +25696,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "ástralskur fótbolti" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "" @@ -25784,6 +25742,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "fótbolti" +#, fuzzy +msgid "gaelic_football" +msgstr "ástralskur fótbolti" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -25824,5 +25783,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +msgid "rugby_union" msgstr "" @@ -25943,6 +25907,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -25956,5 +25924,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -25976,4 +25943,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "gerð" @@ -25997,6 +25966,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26009,5 +25982,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26029,4 +26001,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "völlur" @@ -26049,4 +26023,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "íþróttamiðstöð" @@ -26069,4 +26045,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "íþróttaleikvangur" @@ -26089,4 +26067,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -26288,158 +26268,193 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Amerískur fótbolti" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Breyti Amerískum fótbolta" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Ástralskur fótbolti" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Breyti Áströlskum fótbolta" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Ástralskur fótbolti" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Breyti Áströlskum fótbolta" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Breyti Amerískum fótbolta" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Breyti Áströlskum fótbolta" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Breyti Amerískum fótbolta" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Breyti Amerískum fótbolta" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Breyti smásölulandnýtingu" + +#: build/trans_presets.java:2100 +msgid "Rugby Union" +msgstr "" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Breyti svæði" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Hafnabolti" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Breyti hafnabolta" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Körfubolti" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Breyti körfubolta" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hokkí" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Breyti hokkí" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Borðtennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Breyti borðtennis" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Breyti tennis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Mannvirki" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Bygging" @@ -26447,5 +26462,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Opinber bygging" @@ -26453,10 +26468,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Breyti opinberri byggingu" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Ráðhús" @@ -26464,10 +26479,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Breyti ráðhúsi" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Sendiráð" @@ -26475,10 +26490,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Breyti sendiráði" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Dómshús" @@ -26487,10 +26502,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Breyti dómshúsi" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Fangelsi" @@ -26499,10 +26514,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Breyti fangelsi" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Lögreglustöð" @@ -26512,10 +26527,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Breyti lögreglustöð" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Slökkvistöð" @@ -26524,10 +26539,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Breyti slökkvistöð" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Pósthús" @@ -26535,5 +26550,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Breyti pósthúsi" @@ -26541,15 +26556,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Leikskóli" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Breyti leikskóla" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Skóli" @@ -26557,10 +26572,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Breyti skóla" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Háskóli" @@ -26568,10 +26583,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Breyti háskóla" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Menntaskóli" @@ -26579,5 +26594,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Breyti menntaskóla" @@ -26585,5 +26600,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Kvikmyndahús" @@ -26592,10 +26607,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Breyti kvikmyndahúsi" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Bókasafn" @@ -26604,9 +26619,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Breyti bókasafni" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Listamiðstöð" @@ -26614,10 +26629,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Breyti listamiðstöð" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Leikhús" @@ -26626,10 +26641,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Breyti leikhúsi" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Helgistaður" @@ -26639,5 +26654,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Breyti helgistað" @@ -26646,6 +26661,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "" @@ -26654,66 +26669,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "" @@ -26722,81 +26737,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Heimilisfang" @@ -26805,5 +26820,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Breyti heimilisfangi" @@ -26811,5 +26826,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Húsnúmer" @@ -26817,25 +26832,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Nafn húss" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Nafn götu" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Nafn bæjar" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Póstnúmer" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Landskóði" @@ -26844,5 +26859,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "" @@ -26850,61 +26865,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Mannvirki" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Turn" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Breyti turni" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "" @@ -26912,25 +26927,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Vatnsturn" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Breyti vatnsturni" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Viti" @@ -26938,10 +26953,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Breyti vita" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Vindmylla" @@ -26949,10 +26964,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Breyti vindmyllu" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Leiðsla" @@ -26961,41 +26976,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Breyti leiðslu" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "" @@ -27005,10 +27020,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Krani" @@ -27016,5 +27031,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Breyti krana" @@ -27022,10 +27037,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "" @@ -27033,10 +27048,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Eftirlitsmyndavél" @@ -27044,23 +27059,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Breyti eftirlitsmyndavél" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Rafall" @@ -27070,35 +27085,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Breyti rafli" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Orkuver" @@ -27107,10 +27122,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Breyti orkuveri" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Spennustöð" @@ -27119,5 +27134,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Breyti spennustöð" @@ -27125,10 +27140,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Tilvísunarnúmer línunnar" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Háspennustaur" @@ -27139,23 +27154,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Breyti háspennustaur" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Raflína" @@ -27164,74 +27179,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Breyti raflínu" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Salerni" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Athugasemd" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Póstkassi" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Almenningssími" @@ -27240,5 +27255,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Breyti almenningssíma" @@ -27246,5 +27261,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Mynt" @@ -27252,5 +27267,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Athugasemd" @@ -27258,5 +27273,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "" @@ -27264,5 +27279,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Debetkort" @@ -27270,15 +27285,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Kreditkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Símakort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Endurvinnsla" @@ -27287,5 +27302,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Breyti endurvinnslustöð" @@ -27293,35 +27308,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Rafhlöður" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Dósir" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Föt" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Gler" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Pappír" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Brotajárn" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "" @@ -27329,5 +27344,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "" @@ -27336,31 +27351,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "" @@ -27439,5 +27454,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27447,31 +27462,31 @@ msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "" @@ -27480,30 +27495,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Hæð" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Gosbrunnur" @@ -27512,10 +27527,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Breyti gosbrunn" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Drykkjarvatn" @@ -27524,10 +27539,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Breyti drykkjarvatni" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "" @@ -27536,5 +27551,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "" @@ -27542,5 +27557,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Barnalúga" @@ -27548,15 +27563,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Breyti barnalúgu" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Verslanir" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "" @@ -27564,10 +27579,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Breyti bílabúð" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "" @@ -27576,28 +27591,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Breyti hjólabúð" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "" @@ -27605,9 +27620,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Sjoppa" @@ -27615,27 +27630,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Breyti sjoppu" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Ferðaskrifstofa" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Breyti ferðaskrifstofu" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Slátrari" @@ -27643,9 +27658,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Breyti slátrara" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Bakarí" @@ -27653,9 +27668,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Breyti bakaríi" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Blómabúð" @@ -27663,18 +27678,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Breyti blómabúð" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Lífræn búð" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Breyti lífrænni búð" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "" @@ -27682,54 +27697,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Vínbúð" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Tölvubúð" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Breyti tölvubúð" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Raftækjabúð" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Breyti raftækjabúð" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hljómtækjaverslun" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Breyti hljómtækjaverslun" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Húsgagnaverslun" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Breyti húsgagnaverslun" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "" @@ -27737,9 +27752,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "" @@ -27747,9 +27762,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "" @@ -27757,54 +27772,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Skrifstofuvörur" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Breyti skrifstofuvörum" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Hársnyrtir" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Breyti hársnyrti" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Skóbúð" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Breyti skóbúð" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Dótabúð" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Breyti dótabúð" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Efnalaug" @@ -27812,9 +27827,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Breyti efnalaug" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Þvottahús" @@ -27822,9 +27837,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Breyti þvottahúsi" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Útivistarbúð" @@ -27832,24 +27847,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Breyti útivistarbúð" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Breyti sjóntækjasmið" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Sjálfsali" @@ -27857,5 +27872,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "" @@ -27863,97 +27878,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "dagblöð" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "dót" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Fjármál" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Banki" @@ -27961,14 +27976,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Breyti banka" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Hraðbanki" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Gjaldeyrisskipti" @@ -27976,5 +27991,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Breyti gjaldeyrisskiptum" @@ -27982,15 +27997,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Breyti hraðbanka" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Heilsa" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Læknir" @@ -27998,18 +28013,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Breyti lækni" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Tannlæknir" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Breyti tannlækni" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Apótek" @@ -28017,5 +28032,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Apótek" @@ -28023,9 +28038,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Spítali" @@ -28033,10 +28048,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Breyti spítala" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "" @@ -28045,5 +28060,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "" @@ -28052,20 +28067,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -28073,5 +28088,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Dýralæknir" @@ -28080,64 +28095,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Breyti dýralækni" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Landafræði" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Staðir" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Heimsálfa" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Breyti heimsálfu" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Land" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Breyti landi" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Fylki" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Breyti fylki" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Svæði" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Breyti svæði" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Sýsla" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Breyti sýslu" @@ -28145,15 +28160,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Borg" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Breyti borg" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Bær" @@ -28161,10 +28176,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Breyti bæ" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Hverfi" @@ -28172,25 +28187,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Breyti hverfi" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Þorp" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Breyti þorpi" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Smáþorp" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Breyti smáþorpi" @@ -28198,5 +28213,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "" @@ -28204,10 +28219,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Eyja" @@ -28215,10 +28230,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Breyti eyju" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "" @@ -28226,5 +28241,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "" @@ -28232,5 +28247,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Hellismunni" @@ -28238,10 +28253,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Breyti hellismunna" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Tindur" @@ -28249,10 +28264,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Breyti tind" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Jökull" @@ -28260,10 +28275,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Breyti jökli" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Eldfjall" @@ -28271,70 +28286,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Breyti eldfjalli" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Landamæri" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Breyti landamærum þjóðgarðs" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Landnýting" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Tré" @@ -28343,15 +28358,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Breyti tré" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Fræðiheiti" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Skógur" @@ -28360,5 +28375,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Breyti skóg" @@ -28366,17 +28381,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "barrskógur" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "laufskógur" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "blandaður" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Skógur (ræktaður)" @@ -28385,14 +28400,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Breyti ræktuðum skóg" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "" @@ -28400,25 +28415,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "" @@ -28426,10 +28441,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "" @@ -28437,5 +28452,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "" @@ -28443,5 +28458,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "" @@ -28450,45 +28465,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "" @@ -28496,25 +28511,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Garður" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Breyti garði" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "" @@ -28522,10 +28537,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "" @@ -28533,20 +28548,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Almenningsgarður" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Breyti almenningsgarð" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "" @@ -28554,5 +28569,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -28560,15 +28575,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Íbúðarsvæði" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Breyti íbúðarlandnýtingu" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Grafreitur" @@ -28576,9 +28591,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Breyti grafreit" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "" @@ -28586,39 +28601,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Breyti kirkjugarðslandnýtingu" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Smásala" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Breyti smásölulandnýtingu" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Skrifstofur" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Breyti skrifstofulandnýtingu" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Iðnaður" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Breyti iðnaðarlandnýtingu" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "" @@ -28626,15 +28641,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "" @@ -28642,50 +28657,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Byggingarsvæði" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Breyti byggingarsvæðislandnýtingu" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "" @@ -28695,5 +28710,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Breyta marghyrningi" @@ -28705,5 +28720,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "" @@ -28711,5 +28726,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "" @@ -28717,5 +28732,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -28726,5 +28741,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -28732,36 +28747,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -28769,5 +28784,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Beygjutakmörkun" @@ -28776,5 +28791,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Breyti beygjutakmörkun" @@ -28782,34 +28797,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "vinstri beygjur óleyfilegar" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "hægri beygjur óleyfilegar" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "óleyfilegt að halda beint áfrám" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "óleyfilegt að taka U-beygju" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "aðeins_beint_fram" @@ -28818,15 +28833,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "af vegi" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "gegnum hnút eða veg" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "að vegi" @@ -28834,5 +28849,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "" @@ -28841,5 +28856,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "" @@ -28847,5 +28862,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "" @@ -28953,5 +28968,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -28962,17 +28977,17 @@ msgstr "hjól" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "" @@ -29040,5 +29055,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29048,9 +29063,9 @@ msgstr "fótgangandi" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "" @@ -29064,10 +29079,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "" @@ -29075,31 +29090,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "" @@ -29108,30 +29123,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "" @@ -29358,5 +29373,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "" @@ -32684,11 +32699,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "" @@ -32702,5 +32717,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" @@ -33056,4 +33071,10 @@ msgstr "" +#~ msgid "football" +#~ msgstr "fótbolti" + +#~ msgid "Football" +#~ msgstr "Amerískur fótbolti" + #~ msgid "Incorrect password or username." #~ msgstr "Rangt lykilorð eða notandanafn" Index: /applications/editors/josm/i18n/po/it.po =================================================================== --- /applications/editors/josm/i18n/po/it.po (revision 22208) +++ /applications/editors/josm/i18n/po/it.po (revision 22209) @@ -5,7 +5,7 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-23 22:12+0000\n" -"Last-Translator: Matteo Fumi \n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-29 20:25+0000\n" +"Last-Translator: Miellino \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -13,5 +13,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:52+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:11+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -24,5 +24,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -66,5 +66,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -74,5 +74,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -243,5 +243,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -249,6 +249,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -335,8 +335,7 @@ msgstr "Nessun livello di riferimento" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Aggiungi nodo..." @@ -661,5 +660,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1055,5 +1054,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1062,5 +1061,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1201,4 +1200,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Sposta nodo..." @@ -1495,6 +1495,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1717,6 +1717,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2375,5 +2373,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2631,10 +2629,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Cerca..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Cerca degli oggetti." @@ -2642,63 +2640,63 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Inserire una stringa di filtro." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Inserire una stringa di ricerca." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Inserire l''espressione di ricerca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "Sostituisci la selezione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "Aggiungi alla selezione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "Rimuovi dalla selezione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "cerca nella selezione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "Distingui maiuscole" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "tutti gli oggetti" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "Include nella ricerca anche gli oggetti incompleti ed eliminati." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "espressione regolare" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" "Via Nazionale - ''Via'' e ''Nazionale'' in qualunque chiave o nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" "\"Via Nazionale\" - ''Via Nazionale'' in qualunque chiave o nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Naz - ''Naz'' in qualunque punto del nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "" @@ -2706,5 +2704,5 @@ "''route''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2714,21 +2712,21 @@ "*=value, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Naz - ''Naz'' non presente all''interno del nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "senso unico? - oneway=yes, true, 1 oppure on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - chiave=foot impostata con qualunque valore." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Ricerche speciali:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2736,17 +2734,17 @@ "type: - tipo dell''oggetto (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - tutti gli oggetti modificati dall''utente" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "user:anonymous - tutti gli oggetti modificati da utenti anonimi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - oggetto con un dato ID (0 per nuovi oggetti)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2756,5 +2754,5 @@ "non è stata assegnata una versione)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2764,5 +2762,5 @@ "di modifiche (0 oggetti a cui non è stato assegnato un gruppo di modifiche)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2772,5 +2770,5 @@ "oppure nodes:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2780,9 +2778,9 @@ "etichette:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "role:... - oggetto con un determinato ruolo in una relazione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2792,21 +2790,21 @@ "12T14:51:09Z, 2009-11-12 oppure T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - tutti gli oggetti modificati" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - tutti gli oggetti selezionati" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - tutti gli oggetti incompleti" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - tutti gli oggetti provi di proprietà" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2815,5 +2813,5 @@ "all''espressione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2822,5 +2820,5 @@ "oggetti corrispondenti all''espressione" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "" @@ -2828,5 +2826,5 @@ "logico ''or''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2834,5 +2832,5 @@ ":)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2843,12 +2841,12 @@ "b>)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Utilizzare ( e ) per raggruppare le espressioni" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2857,33 +2855,46 @@ msgstr "Filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Cerca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Invia filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Inizia Ricerca" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Inserire una espressione di ricerca" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Nessuna corrispondenza trovata per ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nulla è stato aggiunto alla selezione cercando ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nulla è stato rimosso dalla selezione cercando ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" @@ -2891,5 +2902,5 @@ "Nella selezione non è stato trovato alcunché durante la ricerca di ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2897,5 +2908,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2903,5 +2914,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2909,5 +2920,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2915,5 +2926,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -3055,8 +3066,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3199,5 +3210,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3331,11 +3342,11 @@ msgstr[1] "Sposta {0} nodi" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Epurato oggetto ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3344,5 +3355,5 @@ msgstr[1] "Epurati {0} oggetti" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3353,5 +3364,5 @@ "inferiore a 2. Al momento è {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3389,5 +3400,5 @@ msgstr "Risolvi {0} conflitti di etichette nella relazione {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3735,6 +3746,6 @@ "continuare a lavorare senza problemi." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3744,10 +3755,10 @@ msgstr "Manca la destinazione dell''unione per il percorso con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Manca la destinazione dell''unione per l''oggetto con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3755,5 +3766,5 @@ msgstr "Manca la destinazione dell''unione per il nodo con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3762,5 +3773,5 @@ msgstr "Manca la destinazione dell''unione per la relazione con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3769,79 +3780,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "Manca la destinazione dell''unione di tipo {0} con id {1}" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "E" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "H" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Testo" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "R" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "A" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "D" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "F" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

Filtro attivo

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} oggetti nascosti" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "{0} oggetti disabilitati" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "" -"

Chiudi la finestra di filtro per vedere tutti gli oggetti.

" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3981,5 +3917,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "sfondo" @@ -4104,15 +4040,13 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29 msgid "Guyane RGFG95" -msgstr "" +msgstr "Guyane RGFG95" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (Francia)" +msgstr "UTM Francia (DOM)" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "Sistema geodetico settentrionale UTM20" +msgstr "UTM Sistema Geodesic" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4155,5 +4089,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "ferrovia" @@ -4174,7 +4108,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4241,7 +4175,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "building" @@ -4330,5 +4264,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4567,5 +4501,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4884,12 +4818,12 @@ msgstr "il ruolo {0} non partecipa nella comparazione {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Proprietà" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4900,6 +4834,6 @@ msgstr "Etichette" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4907,6 +4841,6 @@ msgstr "Nodi" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4914,9 +4848,9 @@ msgstr "Membri" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Non c''è alcun conflitto di etichette in attesa di risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4925,5 +4859,5 @@ msgstr[1] "Etichette({0} conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4932,9 +4866,9 @@ msgstr[1] "{0} conflitti di etichetta rimanenti da risolvere" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Nodi(risolti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4943,17 +4877,17 @@ "c''è alcun conflitto in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Nodi(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Conflitti in attesa nella lista di nodi di questo percorso" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Membri(risolti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4963,25 +4897,25 @@ "non c''è alcun conflitto in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Membri(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Conflitti in attesa nella lista di membri di questa relazione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Non c''è alcun conflitto di proprietà in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Proprietà(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Conflitti di proprietà in attesa di essere risolti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Risoluzione conflitto" @@ -5030,5 +4964,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Versione personale" @@ -5041,5 +4975,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -5055,5 +4989,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "La loro versione" @@ -5138,5 +5072,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -5148,5 +5082,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Giù" @@ -5253,73 +5187,10 @@ "comando di risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" -"E'' stato generato un errore durante la comunicazione con il " -"server
Dettagli: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Comunicazione con il server fallita" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Si, ripristina anche questo" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "No, annulla l''operazione" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -"C'è {0} ulteriore nodo utilizzato dal percorso {1}
il quale è stato " -"eliminato sul server.

Si desidera ripristinare anche questo nodo?" -msgstr[1] "" -"Ci sono {0} ulteriori nodi utilizzati dal percorso {1}
i quali sono stati " -"eliminati sul server.

Si desidera ripristinare anche questi nodi?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Ripristina i nodi addizionali?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -"C'è {0} ulteriore primitiva a cui fa riferimento la relazione {1}
la " -"quale è stata eliminata sul server.

Si desidera ripristinare anche " -"questa primitiva?" -msgstr[1] "" -"Ci sono {0} ulteriori primitive a cui fa riferimento la relazione {1}
le " -"quali sono state eliminate sul server.

Si desidera ripristinare anche " -"queste primitive?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Ripristina le primitive dipendenti?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" "Proprietà nell''insieme di dati personale, cioè l''insieme di dati locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5329,129 +5200,59 @@ "elementi personali non appena saranno applicate le decisioni." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Proprietà nel loro insieme di dati, cioè l''insieme di dati del server" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Coordinate:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Stato eliminato:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Stato visibile:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "Referenziato da:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(nessuno/a)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "cancellato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "non eliminato" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "visibile (sul server)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "non visibile (sul server)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Mantieni un clone della versione locale" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Elimina fisicamente dall''insieme di dati locale" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Mantieni le mie coordinate" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Mantieni le loro coordinate" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "Marca come irrisolto il conflitto tra coordinate differenti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "Mantieni il mio stato eliminato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "Mantieni il loro stato eliminato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "Marca come irrisolto il conflitto tra stati eliminati" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "Mantieni il mio stato visibile" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Si, reimposta l''id" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" -"Per mantenere la propria versione locale, JOSM
deve ripristinare " -"l''id della primitiva {0} a 0.
Al prossimo caricamento il server gli " -"assegnerà
un nuovo id.
Sei d''accordo?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "Reimposta l''id a 0" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Mantieni il loro stato visibile" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Si, elimina" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM dovrà eliminare la tua primitiva locale con identificativo {0}" -"
dall''insieme di dati.
Si è d''accordo?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Elimina dall''insieme di dati" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "Conflitto irrisolto tra stati di visibilità" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5607,5 +5408,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "tutti" @@ -5689,7 +5490,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5699,6 +5500,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5916,5 +5717,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5974,25 +5775,25 @@ msgstr "Seleziona sulla mappa gli elementi selezionati nella lista qui sopra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Annulla la risoluzione del conflitto e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Applica i conflitti risolti e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Applica risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Chiudi comunque" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Continua risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -6010,22 +5811,22 @@ "risoluzione dei conflitti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "Conflitto non risolto completamente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Risolvi conflitti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Risolvi i conflitti per ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Filtra oggetti e nascondili/disabilitali." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -6038,44 +5839,124 @@ msgstr "Aggiungi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "Aggiungi filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Modifica filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Elimina filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Sposta filtro in alto." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Sposta filtro in basso." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Abilita filtro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Nascondi elementi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Filtro inverso" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Modalità filtro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "Filtri nascosti:{0} Disabilitati:{1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Errore durante il caricamento del file" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "E" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "H" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Testo" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "R" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "A" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "D" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

Filtro attivo

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} oggetti nascosti" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "{0} oggetti disabilitati" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "" +"

Chiudi la finestra di filtro per vedere tutti gli oggetti.

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -6117,26 +5998,26 @@ msgstr "Informazioni avanzate sull''oggetto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Inserire le coordinate per il nuovo nodo." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Usa i gradi decimali." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valori negativi denotano l''emisfero Occidentale/Meridionale." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "" "Per favore inserire un valore di latitudine valido nell''intervallo -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Per favore inserire un valore di latitudine nell''intervallo -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "" @@ -6144,14 +6025,14 @@ "180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "" "Per favore inserire un valore di longitudine nell''intervallo -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Chiudi la finestra e crea un nuovo nodo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Chiudi la finestra, ma non creare un nuovo nodo" @@ -6211,5 +6092,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relazioni" @@ -6259,10 +6140,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "Scarica i membri incompleti delle relazioni selezionate" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "Scarica membri incompleti" @@ -6326,14 +6207,14 @@ msgstr "Sel.: Rel.:{0}/Percorsi:{1}/Nodi:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Selezione: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "Ottieni informazioni dettagliate sullo stato interno degli oggetti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "Analizza" @@ -7056,8 +6937,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -7082,6 +6971,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7464,69 +7351,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Nome" @@ -8170,5 +8058,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8873,8 +8761,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Tipo" @@ -8903,6 +8791,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "sconosciuto" @@ -9272,5 +9160,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Rilevati conflitti" @@ -9857,4 +9745,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -10425,5 +10314,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Descrizione" @@ -10475,5 +10364,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10553,19 +10442,19 @@ "tracciato per poter essere giustamente calcolati." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Livello dati {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "al di fuori dell''area scaricata" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "versione {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" @@ -10573,5 +10462,5 @@ "nella versione 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10580,44 +10469,11 @@ msgstr[1] "Sono stati individuati {0} conflitti." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -"{0} conflitto è stato risolto automaticamente eliminando " -"{0} oggetto
dall''insieme di dati locale perché è stato eliminato dal " -"server." -msgstr[1] "" -"{0} conflitti sono stati risolti automaticamente eliminando " -"{0} oggetti
dall''insieme di dati locale perché sono stati eliminati dal " -"server." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"{0} conflitto in attesa di essere risolto.

Aprire la lista dei " -"conflitti e risolverlo manualmente." -msgstr[1] "" -"{0} conflitti in attesa di essere risolti.

Aprire la lista dei " -"conflitti e risolverli manualmente." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "Cliccare per chiudere questa finestra e continuare a modificare" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10626,32 +10482,32 @@ msgstr[1] "{0} eliminati" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} è composto da:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "disattiva" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "Versione delle API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Converti in un layer GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "Controllo consistenza dell'insieme dei dati" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "Nessun problema trovato" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "Sono stati trovati i seguenti problemi:" @@ -13916,4 +13772,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -15596,5 +15453,5 @@ "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15899,5 +15756,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Interpolazione indirizzo" @@ -16365,17 +16222,17 @@ #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:19 msgid "Big buildings mode" -msgstr "" +msgstr "Modalità grandi edifici" #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:20 msgid "Rotate crosshair" -msgstr "" +msgstr "Ruota mirino" #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23 msgid "Advanced settings" -msgstr "" +msgstr "Impostazioni avanzate" #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30 msgid "Building tag:" -msgstr "" +msgstr "Tag edifici" #: ../plugins/buildings_tools/src/buildings_tools/Building.java:234 @@ -16400,5 +16257,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:27 msgid "Auto-select building" -msgstr "" +msgstr "Selezione Automatica Edifici" #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:44 @@ -16412,5 +16269,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54 msgid "Advanced..." -msgstr "" +msgstr "Avanzate..." #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65 @@ -16421,5 +16278,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379 msgid "Point on the corner of the building to start drawing" -msgstr "" +msgstr "Posizionati nell'angolo dell'edificio per iniziare a disegnare" #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381 @@ -16429,38 +16286,39 @@ #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383 msgid "Set width of the building" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +msgstr "Imposta la larghezza dell'edificio" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Multi-poligono" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "indirizzo" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Crea una nuova relazione" +msgstr "Aggiungi indirizzo" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Edifici" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Numero" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Successivo" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Strada" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Indirizzi" +msgstr "Inserisci indirizzo" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -16631,11 +16489,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "Disabilita il ritaglio dell''immagine durante la georeferenziazione." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." msgstr "Seleziona il primo livello WMS della lista." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." +msgstr "" #. item "Man Made/Pipeline" combo "Type" @@ -16689,7 +16551,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -16698,13 +16560,13 @@ msgstr "acqua" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "simbolo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "particella catastale" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "appezzamento numero" @@ -16752,32 +16614,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "indirizzo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "località" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "sezione" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "comune" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Abilita la cache automatica." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Massima dimensione della cache (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16795,9 +16657,9 @@ "caricamento di dati creati da questa estensione." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "WMS francese del catasto" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -16805,10 +16667,10 @@ "automatica" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Sorgente" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16818,5 +16680,5 @@ "preferenze di JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16826,9 +16688,9 @@ "intermedi). Utile per testi su sfondi scuri." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Permette la sovrapposizione di livelli multipli" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -16836,116 +16698,116 @@ "trasparente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Traccia un rettangolo attorno i dati scaricati dal server WMS." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "Risoluzione immagine:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "Alta risoluzione (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "Media risoluzione (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "Bassa risoluzione (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "Interpolazione zoom immagine:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Ordine zero (la più veloce) [ Predefinita ]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "Bilineare (veloce)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "Bicubica (lenta)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "Moltiplicatore di trascinamento per immagini vettoriali:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "Trascina una immagine a pieno schermo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Trascina immagini più piccole (maggiore qualità ma più utilizzo di memoria)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "Dimensioni fisse riquadro (predefinito è 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Dimensioni fisse (da 25 a 1000 metri)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "Livelli:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "Mari, fiumi, piscine." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "Edifici, luoghi chiusi, costruzioni sotto terra." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "Simboli, come la croce cristiana." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "Particelle catastali." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "Numeri delle particelle catastali, nomi delle strade." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "Indirizzo, numeri civici." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "Località, paese, luogo." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "Sezioni e sottosezioni catastali." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "Confini comunali." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "Moltiplicatore di trascinamento per immagini raster:" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "Mostra trasversali:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -16953,5 +16815,5 @@ "dimensione" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16960,4 +16822,8 @@ "Seleziona automaticamente il primo livello WMS se esistono più livelli " "durante l''operazione di cattura." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 @@ -17282,5 +17148,5 @@ msgstr "Riquadro del comune: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -17291,9 +17157,9 @@ "Crearne uno nuovo." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Errore nel formato della cache" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -17302,5 +17168,5 @@ "Lambert {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "Errore nella zona di Lambert della cache" @@ -17445,21 +17311,21 @@ #: ../plugins/ext_tools/src/ext_tools/ExtTool.java:188 msgid "Child script have returned invalid data." -msgstr "" +msgstr "Lo script figlio riporta dati non validi" #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:45 msgid "Edit tool" -msgstr "" +msgstr "Strumenti di modifica" #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:53 msgid "Name:" -msgstr "" +msgstr "Nome:" #: ../plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java:54 msgid "CmdLine:" -msgstr "" +msgstr "Linea di comando" #: ../plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java:26 msgid "External tools" -msgstr "" +msgstr "Strumenti esterni" #. Plugin ext_tools @@ -17467,10 +17333,10 @@ #: build/trans_plugins.java:24 msgid "Use external scripts in JOSM" -msgstr "" +msgstr "Usa script esterni in JOSM" #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:73 #, java-format msgid "Delete tool \"{0}\"?" -msgstr "" +msgstr "Eliminare strumento \"{0}\"?" #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:74 @@ -17480,9 +17346,9 @@ #: ../plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java:91 msgid "New tool..." -msgstr "" +msgstr "Nuovo strumento..." #: ../plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java:54 msgid "Install" -msgstr "" +msgstr "Installa" #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81 @@ -18607,4 +18473,26 @@ msgstr "Trascinare per ridimensionare l''immagine sull''asse Y" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +#, fuzzy +msgid "Create Stops from GTFS ..." +msgstr "Crea fermate da GPX ..." + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +#, fuzzy +msgid "Create Stops from a GTFS file" +msgstr "Crea fermate da file GPX" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "E''stata generata una eccezione IO \"{0}\"" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +#, fuzzy +msgid "GTFS-Stops" +msgstr "Fermate" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -18646,9 +18534,4 @@ msgid "Create Stops from a GPX file" msgstr "Crea fermate da file GPX" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" -msgstr "E''stata generata una eccezione IO \"{0}\"" #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83 @@ -18820,17 +18703,17 @@ #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java:83 msgid "Road Sign Plugin" -msgstr "" +msgstr "Plugin segnali stradali" #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53 msgid "Roadsign tagging" -msgstr "" +msgstr "Tag segnale stradale" #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:53 msgid "Add tags by clicking on road signs" -msgstr "" +msgstr "Aggiungi il tag cliccando sul segnale stradale" #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:54 msgid "Roadsigns plugin: open dialog" -msgstr "" +msgstr "Plugin segnali stradali : apri finestra" #: ../plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java:89 @@ -18961,9 +18844,9 @@ #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:42 msgid "Simplify Area" -msgstr "" +msgstr "Semplifica Area" #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:41 msgid "Delete unnecessary nodes from an area." -msgstr "" +msgstr "Elimina i nodi non necessari di un'area" #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139 @@ -20274,5 +20157,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Altro" @@ -20463,5 +20346,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Multi-poligono" @@ -21013,5 +20896,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "area" @@ -21057,34 +20940,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Nessun dato" - -#. translation note: don't translate quoted words +msgstr "Nessun tag" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -21109,7 +20995,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Percorsi senza etichetta" +msgstr "Strada non taggata (commentata)" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -21155,5 +21040,5 @@ #, java-format msgid "{0} {1}% of GPS track" -msgstr "" +msgstr "{0} {1}% della traccia GPS" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:110 @@ -21163,57 +21048,57 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113 msgid "Import Video" -msgstr "" +msgstr "Importa video" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:113 msgid "Sync a video against this GPS track" -msgstr "" +msgstr "Sincronizza un video su questa traccia GPS" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137 msgid "Remove Video" -msgstr "" +msgstr "Rimuovi video" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:137 msgid "removes current video from layer" -msgstr "" +msgstr "Rimuovi il video corrente dal livello" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144 msgid "play/pause" -msgstr "" +msgstr "play/pausa" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:144 msgid "starts/pauses video playback" -msgstr "" +msgstr "Inizia/ferma la riproduzione video" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151 msgid "backward" -msgstr "" +msgstr "Indietro" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:151 msgid "jumps n sec back" -msgstr "" +msgstr "salta n secondi indietro" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159 msgid "forward" -msgstr "" +msgstr "avanti" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:159 msgid "jumps n sec forward" -msgstr "" +msgstr "salta n secondi avanti" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167 msgid "faster" -msgstr "" +msgstr "più veloce" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:167 msgid "faster playback" -msgstr "" +msgstr "aumenta velocità riproduzione" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:175 msgid "slower" -msgstr "" +msgstr "più lento" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:175 msgid "slower playback" -msgstr "" +msgstr "diminuisce velocità riproduzione" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:183 @@ -21229,28 +21114,28 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:193 msgid "Keep centered" -msgstr "" +msgstr "Mantieni centrato" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:193 msgid "follows the video icon automaticly" -msgstr "" +msgstr "segui l'icona del video automaticamente" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:207 msgid "Jump length" -msgstr "" +msgstr "Lunghezza salto" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:203 msgid "Set the length of a jump" -msgstr "" +msgstr "Imposta la lunghezza del salto" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:207 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:218 msgid "Jump in video for x ms" -msgstr "" +msgstr "Salta il video per x ms" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:214 #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:218 msgid "Loop length" -msgstr "" +msgstr "Lunghezza ripetizione" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:214 @@ -21260,5 +21145,5 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:227 msgid "no deinterlacing" -msgstr "" +msgstr "non deinterlacciare" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:235 @@ -21268,17 +21153,17 @@ #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:243 msgid "deinterlacing using linear interpolation" -msgstr "" +msgstr "deinterlacciamento con interpolazione lineare" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:99 msgid "play" -msgstr "" +msgstr "riproduci" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:131 msgid "Unable to find JNA Java library!" -msgstr "" +msgstr "Impossibile trovare la libreria Java JNA" #: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/SimpleVideoPlayer.java:135 msgid "Unable to find native libvlc library!" -msgstr "" +msgstr "Impossibile trovare la libreira libvlc nativa" #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23 @@ -21685,5 +21570,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186 msgid "Simultaneous connections" -msgstr "" +msgstr "Connessioni simultanee" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 @@ -21955,7 +21840,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:23 -#, fuzzy msgid "Abort file chooser dialog" -msgstr "Esci dalla finestra di selezione file." +msgstr "Esci schermata selezione file" #. Strings in JFileChooser @@ -22067,7 +21951,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Apri file selezionato." +msgstr "Apri il file selezionato" #. Strings in JFileChooser @@ -22395,7 +22278,14 @@ msgstr "Estensione per il ripristino dei gruppi di modifiche" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -22407,10 +22297,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Fornisce funzioni di navigazione" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -22419,5 +22309,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -22428,15 +22318,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Permetti l''aggiunta di marcatori/nodi alle posizioni gps correnti." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Fornisce un''interfaccia per l''editing dei tag in forma tabulare" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -22450,10 +22340,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "Costruisce un complesso di edifici a partire da singoli blocchi." #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -22465,5 +22355,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -22474,5 +22364,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -22484,10 +22374,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "Permette di ripristinare un oggetto dal database di OSM" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -22499,5 +22389,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -22510,5 +22400,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -22520,5 +22410,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -22526,10 +22416,10 @@ #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "Seleziona una sequenza di percorsi connessi non ramificati" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -22540,5 +22430,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -22673,5 +22563,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Riferimento" @@ -23210,5 +23100,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "metallo" @@ -23221,5 +23111,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "bosco" @@ -23524,8 +23414,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "si" @@ -23636,8 +23526,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "no" @@ -23943,5 +23833,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "strada di servizio" @@ -24061,5 +23951,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "escursionismo" @@ -24208,4 +24098,9 @@ msgid "Edit Motorway Junction" msgstr "Modifica svincolo autostradale" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Numero" #. item "Waypoints/Motorway Junction" text "Number" @@ -24258,13 +24153,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operatore" @@ -24532,6 +24427,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Elevazione" @@ -25383,5 +25278,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Tensione" @@ -25752,24 +25647,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Orario di apertura" @@ -25836,23 +25731,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24/7" @@ -25866,23 +25761,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "Lu-Ve 08:30-20:00" @@ -25896,23 +25791,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00" @@ -26026,6 +25921,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Numero di riferimento" @@ -26041,5 +25936,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "sotterraneo" @@ -26053,5 +25948,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Tariffa" @@ -26227,5 +26122,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Sedia a rotelle" @@ -26263,5 +26158,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Pensilina/ricovero" @@ -26269,5 +26164,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Panchina" @@ -26386,5 +26281,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Torre radio" @@ -27123,5 +27018,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Articoli sportivi" @@ -27196,5 +27091,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -27308,12 +27251,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -27380,12 +27315,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -27399,12 +27326,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -27566,5 +27485,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "sport" @@ -27591,4 +27511,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "football_australiano" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "football_australiano" @@ -27616,4 +27542,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "football_australiano" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "canoa" @@ -27656,6 +27588,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "football_americano" +#, fuzzy +msgid "gaelic_football" +msgstr "football_australiano" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27696,5 +27629,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "rugby" @@ -27815,6 +27754,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -27828,5 +27771,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -27848,4 +27790,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "tipo" @@ -27869,6 +27813,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -27881,5 +27829,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -27901,4 +27848,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "campo_sportivo" @@ -27921,4 +27870,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "centro_sportivo" @@ -27941,4 +27892,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "stadio" @@ -27961,4 +27914,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "tracciato" @@ -28160,158 +28115,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Football" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Modifica football" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Football australiano" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Modifica football australiano" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Football australiano" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Modifica football australiano" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Modifica football" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Modifica football australiano" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Modifica football" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Modifica football" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Modifica Rugby" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Modifica Rugby" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Modifica Baseball" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Pallacanestro" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Modifica Pallacanestro" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Modifica Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "campo_da_golf" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Boule (sport popolare in Francia)" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Modifica boule (sport popolare in Francia)" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Bocce" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Modifica Bocce" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Modifica Cricket" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Reti per Cricket" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Modifica Reti per Cricket" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Modifica croquet" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Modifica Hockey" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Modifica Pelota" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Racquet" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Modifica racquet" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Modifica Rugby" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Tennis da tavolo" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Modifica Tenniis da tavolo" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Modifica Tennis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Artificiale" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Palazzo" @@ -28319,5 +28310,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Edificio pubblico" @@ -28325,10 +28316,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Modifica edificio pubblico" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Municipio" @@ -28336,10 +28327,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Modifica municipio" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Ambasciata" @@ -28347,10 +28338,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Modifica ambasciata" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Tribunale" @@ -28359,10 +28350,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Modifica Palazzio del tribunale" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Prigione" @@ -28371,10 +28362,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Modifica Prigione" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Polizia" @@ -28384,10 +28375,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Modifica Polizia" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Vigili del fuoco" @@ -28396,10 +28387,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Modifica vigili del fuoco" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Ufficio Postale" @@ -28407,5 +28398,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Modifica Ufficio Postale" @@ -28413,15 +28404,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Asilo infantile" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Modifica asilo infantile" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Scuola" @@ -28429,10 +28420,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Modifica scuola" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Università" @@ -28440,10 +28431,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Modifica Università" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Scuola superiore" @@ -28451,5 +28442,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Modifica scuola superiore" @@ -28457,5 +28448,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Cinema" @@ -28464,10 +28455,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Modifica Cinema" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Biblioteca" @@ -28476,9 +28467,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Modifica biblioteca" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Centro Artistico" @@ -28486,10 +28477,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Modifica centro d''arte" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Teatro" @@ -28498,10 +28489,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Modifica Teatro" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Luogo di culto" @@ -28511,5 +28502,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Modifica Luogo di culto" @@ -28518,6 +28509,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Religione" @@ -28526,66 +28517,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "Bahaista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "Buddista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "Cristiana" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "Induista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "Giainista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "Ebraica" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "Mussulmana" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "Sikh" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "Spiritualista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "Taoista" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "Unitariana" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "Zoroastrista" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Denominazione" @@ -28594,81 +28585,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "Anglicana" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "Battista" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "Cattolica" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "Evangelica" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "Testimoni di Geova" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "Luterana" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "Metodista" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "Mormone" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "Ortodossa" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "Pentecostale" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "Prebiteriana" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "Protestante" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "Quacchera" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "Sciita" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "Sunnita" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Indirizzi" @@ -28677,5 +28668,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Modifica dati indirizzo" @@ -28683,5 +28674,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Numero civico" @@ -28689,25 +28680,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Nome Casa" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Nome Strada" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Nome città" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Codice postale" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Codice nazione" @@ -28716,5 +28707,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Modifica interpolazione indirizzo" @@ -28722,61 +28713,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Schema numerazione" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "dispari" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "pari" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "alfabetico" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Artificiale" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Fabbrica" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Modifica fabbrica" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Torre" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Modifica torre" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "Tipo di torre" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "telecomunicazioni" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "osservazione" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Altezza (metri)" @@ -28784,25 +28775,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Torre idrica" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Modifica torre idrica" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Gasometro" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Modifica gasometro" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Faro" @@ -28810,10 +28801,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Modifica faro" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Mulino a vento" @@ -28821,10 +28812,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Modifica mulino a vento" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Conduttura" @@ -28833,41 +28824,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Modifica conduttura" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "gas" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "calore" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "petrolio" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "liquami" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "qualunque sostanza" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Posizione" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "subacqueo" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "sopra il suolo" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Depuratore acqua" @@ -28877,10 +28868,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Modifica depuratore acqua" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Gru permanente" @@ -28888,5 +28879,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Modifica gru permanente" @@ -28894,10 +28885,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Modifica torre radio" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Punto geodetico o altra stazione fissa" @@ -28905,10 +28896,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Modifica punto geodetico o altra stazione fissa" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Telecamera di sorveglianza" @@ -28916,23 +28907,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Modifica telecamera di sorveglianza" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "interno" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "esterno" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "pubblico" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Centrale elettrica" @@ -28942,35 +28933,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Modifica centrale elettrica" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "eolica" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "idroelettrica" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "a combustibile fossile" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "fissione nucleare" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "carbone" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "fotovoltaico" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Stazione elettrica" @@ -28979,10 +28970,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Modifica stazione elettrica" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Sottostazione elettrica" @@ -28991,5 +28982,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Modifica sottostazione elettrica" @@ -28997,10 +28988,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Riferimento linea" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Pilone (elettricità)" @@ -29011,23 +29002,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Modifica pilone (elettricità)" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "traliccio" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "palo" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "Riferimento torre" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Linea elettrica" @@ -29036,74 +29027,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Modifica linea elettrica" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Tipo di linea" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "linea" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "linea minore" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Quantità di cavi" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Numero di fili (conduttori) per cavo elettrico" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "singola" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "doppia" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "tripla" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "quadrupla" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Servizi" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Bagni pubblici" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "limitato" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Nota" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Cassetta Postale" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telefono" @@ -29112,5 +29103,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Modifica Telefono" @@ -29118,5 +29109,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Monete" @@ -29124,5 +29115,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Note" @@ -29130,5 +29121,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Portafogli elettronici e carte di debito" @@ -29136,5 +29127,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Carte di debito" @@ -29142,15 +29133,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Carte di credito" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Carte telefoniche" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Riciclaggio" @@ -29159,5 +29150,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Modifica Stazione di riciclaggio" @@ -29165,35 +29156,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Batterie" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Lattine" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Vestiti" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Vetro" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Carta" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Rottami metallici" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "Cestino della spazzatura" @@ -29201,5 +29192,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Modifica cestino della spazzatura" @@ -29208,31 +29199,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "Schienale" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Materiale" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "pietra" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "plastica" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Colore" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "nero" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "marrone" @@ -29311,5 +29302,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -29319,31 +29310,31 @@ msgstr "verde" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "rosso" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "blu" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "grigio" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "bianco" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Quantità di posti" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Postazione di caccia" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Modifica una postazione di caccia" @@ -29352,30 +29343,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Modifica Albero" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "basso" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "mezzo" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "completo" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Nascondi" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Blocco" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Fontana" @@ -29384,10 +29375,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Modifica Fontana" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Acqua potabile" @@ -29396,10 +29387,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Modifica acqua potabile" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Pompa antincendio" @@ -29408,5 +29399,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Modifica pompa antincendio" @@ -29414,5 +29405,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Culla per la vita" @@ -29420,15 +29411,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Modifica culla per la vita" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Negozi" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Concessionaria" @@ -29436,10 +29427,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Modifica concessionaria" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Negozio di biciclette" @@ -29448,28 +29439,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Modifica negozio di biciclette" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermercato" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Modifica Supermercato" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Articoli di pulizia e bellezza" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Modifica negozio di articoli di pulizia e bellezza" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Minimarket" @@ -29477,9 +29468,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Modifica minimarket" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Chiosco" @@ -29487,27 +29478,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Modifica chiosco" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Libreria" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Modifica libreria" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Agenzia di viaggi" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Modifica agenzia di viaggi" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Macellaio" @@ -29515,9 +29506,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Modifica Macellaio" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Panificio" @@ -29525,9 +29516,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Modifica Panificio" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Fiorista" @@ -29535,18 +29526,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Modifica Fiorista" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Prodotti biologici" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Modifica negozio di prodotti biologici" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Alcolici (non in Italia)" @@ -29554,54 +29545,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Modifica negozio di alcolici (non in Italia)" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Bevande" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Modifica negozio di bevande" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Computer" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Modifica negozio di informatica" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Elettronica" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Modifica Negozio di Elettronica" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hi-Fi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Modifica negozio di Hi-Fi" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Mobilia" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Modifica Negozio di Mobilia" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Giardinaggio" @@ -29609,9 +29600,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Modifica giardinaggio" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Ferramenta" @@ -29619,9 +29610,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Modifica Negozio di Ferramenta" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Fai-da-te" @@ -29629,54 +29620,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Modifica negozio Fai-da-te" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Cartoleria" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Modifica cartoleria" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Parrucchiere/barbiere" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Modifica parrucchiere/barbiere" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Calzature" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Modifica Negozio di Scarpe" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Giocattoli" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Modifica Negozio di Giocattoli" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Videoteca" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Modifica videoteca" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Lavanderia a secco" @@ -29684,9 +29675,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Modifica Lavanderia a secco" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Lavanderia" @@ -29694,9 +29685,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Modifica lavanderia" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Sport all''aperto" @@ -29704,24 +29695,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Modifica sport all''aperto" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Modifica articoli sportivi" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Ottico" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Modifica Ottico" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Distributore automatico" @@ -29729,5 +29720,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Modifica Distributore automatico" @@ -29735,97 +29726,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Distributore automatico" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "Biglietti trasporto pubblico" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "Orari trasporto pubblico" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "Biglietti per il parcheggio" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "Alimenti" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "Bevande" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "Dolci" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "Sigarette" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "fotografie" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "Cibo per animali" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "Giornali" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "giocattoli" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "francobolli" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "Schede SIM" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "buoni_telefonici" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "buoni" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "camera d''aria per biciclette" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "preservativi" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "assorbenti" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "Sacchetto per escrementi" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "Conto o carta fedeltà" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Contanti" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Banca" @@ -29833,14 +29824,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Modifica banca" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Bancomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Cambiavalute" @@ -29848,5 +29839,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Modifica cambiavalute" @@ -29854,15 +29845,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Modifica bancomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Salute" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Ambulatorio" @@ -29870,18 +29861,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Modifica ambulatorio" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Dentista" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Modifica dentista" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Farmacia" @@ -29889,5 +29880,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Modifica Farmacia" @@ -29895,9 +29886,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Vendita medicinali con obbligo di prescrizione" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Ospedale" @@ -29905,10 +29896,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Modifica Ospedale" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Colonnina SOS" @@ -29917,5 +29908,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Modifica colonnina SOS" @@ -29924,20 +29915,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Numero del punto" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Nome del punto" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Numero di telefono" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Usare prefisso internazionale, es. +12-345-67890)" @@ -29945,5 +29936,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Veterinario" @@ -29952,64 +29943,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Modifica veterinario" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Geografia" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Luoghi" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Continente" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Modifica continente" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Nazione" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Modifica nazione" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Regione" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Modifica regione" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Provincia" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Modifica provincia" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Contea (in Italia NON usare)" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Modifica contea (in Italia NON usare)" @@ -30017,15 +30008,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Città" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Modifica città" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Paese" @@ -30033,10 +30024,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Modifica paese" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Quartiere" @@ -30044,25 +30035,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Modifica quartiere" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Frazione" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Modifica frazione" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Borgo" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Modifica borgo" @@ -30070,5 +30061,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Località (luogo con nome, non popolato)" @@ -30076,10 +30067,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Modifica località (luogo con nome, non popolato)" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Isola" @@ -30087,10 +30078,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Modifica isola" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Isoletta" @@ -30098,5 +30089,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Modifica isoletta" @@ -30104,5 +30095,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Entrata di una grotta/caverna" @@ -30110,10 +30101,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Modifica entrata di una grotta/caverna" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Picco montuoso" @@ -30121,10 +30112,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Modifica picco montuoso" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Ghiacciaio" @@ -30132,10 +30123,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Modifica Ghiacciaio" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Vulcano" @@ -30143,70 +30134,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Modifica vulcano" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Confini" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Nazionale" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Modifica confine nazionale" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Amministrativo" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Modifica confine amministrativo" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Civile" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Modifica confine civile" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Politico" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Modifica confine politico" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Parco nazionale" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Modifica Confine Parco Nazionale" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Uso del terreno" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Albero" @@ -30215,15 +30206,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Modifica albero singolo" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Nome Botanico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Bosco" @@ -30232,5 +30223,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Modifica bosco" @@ -30238,17 +30229,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "Conifere" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "deciduo (caducifoglie)" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "Mista" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Foresta" @@ -30257,14 +30248,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Modifica area di foresta" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Riserva naturale" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Modifica riserva naturale" @@ -30272,25 +30263,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Ghiaione" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Modifica ghiaione" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Boscaglia" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Modifica boscaglia" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Prato alpino" @@ -30298,10 +30289,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Modifica prato alpino" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Brughiera" @@ -30309,5 +30300,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Modifica brughiera" @@ -30315,5 +30306,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Aia" @@ -30322,45 +30313,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Modifica aia" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Area agricola" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Modifica area agricola" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Prato" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Modifica area a prato" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Vigna" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Modifica area di vigneto" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "" @@ -30369,25 +30360,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Giardino" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Modifica giardino" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Erba" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Modifica area di prato" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Village Green" @@ -30395,10 +30386,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Modifica Village Green" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Area comune (UK)" @@ -30406,20 +30397,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Modifica area comune (UK)" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Parco" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Modifica parco" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Area di svago" @@ -30427,5 +30418,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Modifica area di svago" @@ -30433,15 +30424,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Area residenziale" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Modifica area residenziale" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Cimitero" @@ -30449,9 +30440,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Modifica Cimitero" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Cimitero" @@ -30459,39 +30450,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Modifica area di cimitero (esteso)" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Commerciale (negozi)" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Modifica area commerciale (negozi)" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Commerciale (uffici)" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Modifica area commerciale (uffici)" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Industriale" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Modifica area industriale" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Deposito materiale ferroviario" @@ -30499,15 +30490,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Modifica deposito materiale ferroviario" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Militare" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Modifica area militare" @@ -30515,50 +30506,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Area in costruzione" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Modifica area in costruzione" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Ridestinazione d''uso" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Modifica area di ridestinazione d''uso" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Area agricola destinata alla costruzione" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Modifica area agricola destinata alla costruzione" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Discarica" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Modifica area di discarica" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Cava" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Modifica area di cava/miniera" @@ -30568,5 +30559,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Modifica un multi-poligono" @@ -30578,5 +30569,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "segmento esterno" @@ -30584,5 +30575,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "segmento interno" @@ -30590,5 +30581,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "Confine" @@ -30599,5 +30590,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "Modifica confine" @@ -30605,36 +30596,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "Tipo di confine" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "amministrativo" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "nazionale" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "civile" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "circoscrizione elettorale" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "Livello amministrativo" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "Sotto-area" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "Centro amministrativo" @@ -30642,5 +30633,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Divieto di svolta" @@ -30649,5 +30640,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Modifica un divieto di svolta" @@ -30655,34 +30646,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Divieto" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "no svolta a sinistra" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "no svolta a destra" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "non diritto" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "no inversione di marcia" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "solo svolta a destra" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "solo svolta a sinistra" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "solo diritto" @@ -30691,15 +30682,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "dal percorso" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "attraverso il nodo o percorso" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "verso il percorso" @@ -30707,5 +30698,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Itinerario" @@ -30714,5 +30705,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Modifica un itinerario" @@ -30720,5 +30711,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Tipo di itinerario" @@ -30826,5 +30817,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -30835,17 +30826,17 @@ msgstr "bicicletta" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "autobus" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "strada" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "traghetto" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "sci" @@ -30913,5 +30904,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -30921,9 +30912,9 @@ msgstr "pedone" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "deviazione" @@ -30937,10 +30928,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "metropolitana" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Descrizione del simbolo" @@ -30948,31 +30939,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Rete" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "Stato dell''itinerario" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "proposto" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "alternativo" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "temporaneo" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "collegamento" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Colore (esadecimale)" @@ -30981,30 +30972,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "segmento di itinerario" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "segmento diretto" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "segmento opposto" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "punto di fermata" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "punto di fermata diretto" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "punto di fermata opposto" @@ -31231,5 +31222,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "deprecato" @@ -34557,11 +34548,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "luogo" @@ -34575,5 +34566,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "dati tiger" @@ -34928,4 +34919,145 @@ msgid "Sicily - Italy" msgstr "Sicilia - Italia" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "E'' stato generato un errore durante la comunicazione con il " +#~ "server
Dettagli: {0}" + +#~ msgid "Communication with server failed" +#~ msgstr "Comunicazione con il server fallita" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Si, ripristina anche questo" + +#~ msgid "No, cancel operation" +#~ msgstr "No, annulla l''operazione" + +#~ msgid "" +#~ "There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgid_plural "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" +#~ msgstr[0] "" +#~ "C'è {0} ulteriore nodo utilizzato dal percorso {1}
il quale è stato " +#~ "eliminato sul server.

Si desidera ripristinare anche questo nodo?" +#~ msgstr[1] "" +#~ "Ci sono {0} ulteriori nodi utilizzati dal percorso {1}
i quali sono " +#~ "stati eliminati sul server.

Si desidera ripristinare anche questi " +#~ "nodi?" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Ripristina i nodi addizionali?" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "C'è {0} ulteriore primitiva a cui fa riferimento la relazione {1}
la " +#~ "quale è stata eliminata sul server.

Si desidera ripristinare anche " +#~ "questa primitiva?" +#~ msgstr[1] "" +#~ "Ci sono {0} ulteriori primitive a cui fa riferimento la relazione {1}" +#~ "
le quali sono state eliminate sul server.

Si desidera " +#~ "ripristinare anche queste primitive?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Ripristina le primitive dipendenti?" + +#~ msgid "Visible State:" +#~ msgstr "Stato visibile:" + +#~ msgid "visible (on the server)" +#~ msgstr "visibile (sul server)" + +#~ msgid "not visible (on the server)" +#~ msgstr "non visibile (sul server)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Mantieni un clone della versione locale" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Elimina fisicamente dall''insieme di dati locale" + +#~ msgid "Keep my visible state" +#~ msgstr "Mantieni il mio stato visibile" + +#~ msgid "Yes, reset the id" +#~ msgstr "Si, reimposta l''id" + +#~ msgid "" +#~ "To keep your local version, JOSM
has to reset the id of " +#~ "primitive {0} to 0.
On the next upload the server will assign
it a " +#~ "new id.
Do you agree?" +#~ msgstr "" +#~ "Per mantenere la propria versione locale, JOSM
deve ripristinare " +#~ "l''id della primitiva {0} a 0.
Al prossimo caricamento il server gli " +#~ "assegnerà
un nuovo id.
Sei d''accordo?" + +#~ msgid "Reset id to 0" +#~ msgstr "Reimposta l''id a 0" + +#~ msgid "Keep their visible state" +#~ msgstr "Mantieni il loro stato visibile" + +#~ msgid "Yes, purge it" +#~ msgstr "Si, elimina" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM dovrà eliminare la tua primitiva locale con identificativo {0}" +#~ "
dall''insieme di dati.
Si è d''accordo?" + +#~ msgid "Remove from dataset" +#~ msgstr "Elimina dall''insieme di dati" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Conflitto irrisolto tra stati di visibilità" + +#~ msgid "" +#~ "{0} conflict has been resolved automatically by purging " +#~ "{0} object
from the local dataset because it is deleted on the server." +#~ msgid_plural "" +#~ "{0} conflicts have been resolved automatically by " +#~ "purging {0} objects
from the local dataset because they are deleted " +#~ "on the server." +#~ msgstr[0] "" +#~ "{0} conflitto è stato risolto automaticamente eliminando " +#~ "{0} oggetto
dall''insieme di dati locale perché è stato eliminato dal " +#~ "server." +#~ msgstr[1] "" +#~ "{0} conflitti sono stati risolti automaticamente " +#~ "eliminando {0} oggetti
dall''insieme di dati locale perché sono stati " +#~ "eliminati dal server." + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "{0} conflitto in attesa di essere risolto.

Aprire la lista dei " +#~ "conflitti e risolverlo manualmente." +#~ msgstr[1] "" +#~ "{0} conflitti in attesa di essere risolti.

Aprire la lista dei " +#~ "conflitti e risolverli manualmente." + +#~ msgid "Create house number and street name relation" +#~ msgstr "Crea una relazione tra numero civico e nome della strada" + +#~ msgid "football" +#~ msgstr "football_americano" + +#~ msgid "Football" +#~ msgstr "Football" #~ msgid "No data imported." Index: /applications/editors/josm/i18n/po/ja.po =================================================================== --- /applications/editors/josm/i18n/po/ja.po (revision 22208) +++ /applications/editors/josm/i18n/po/ja.po (revision 22209) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-23 22:28+0000\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-07-01 03:58+0000\n" "Last-Translator: higa4 \n" "Language-Team: Japanese \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:09+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: JAPAN\n" @@ -30,5 +30,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -72,5 +72,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -80,5 +80,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -247,5 +247,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -253,6 +253,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -342,8 +342,7 @@ msgstr "対象のレイヤーがありません。" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "ノードを追加..." @@ -664,5 +663,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1046,5 +1045,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1053,5 +1052,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1191,4 +1190,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "ノードを移動..." @@ -1473,6 +1473,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1693,6 +1693,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2319,5 +2317,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2562,10 +2560,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "検索..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "オブジェクトを検索" @@ -2573,49 +2571,49 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "フィルター文字列を入力してください。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "検索文字列を入力してください" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "検索表現を入力" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "セレクションを置換" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "セレクションに加える" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "セレクションの削除" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "選択範囲の中から見つける" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "大/小文字を区別する" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "全オブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "検索に不完全および削除済みオブジェクトも含める。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "正規表現検索" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" @@ -2623,5 +2621,5 @@ "ト'' を両方含むもの" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" @@ -2629,13 +2627,13 @@ "を含むもの。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak - nameタグに ''Bak'' を含むもの" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - キー ''type'' の値が ''route'' であるもの" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2645,21 +2643,21 @@ "ます。*=value, type=, *=*, *=なども可能です。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - name に\"Bak'' を含まない" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "oneway? - oneway=yes もしくは true, 1, on のオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - key=任意の値を入力してください." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "特殊なターゲット:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2667,17 +2665,17 @@ "type: - オブジェクトの型 (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - 該当ユーザに変更された全オブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "user:anonymous - 匿名ユーザによって変更された全てのオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - オブジェクトに与えられた ID (0 は新しいオブジェクト)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2687,5 +2685,5 @@ "いオブジェクトは0）" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2695,5 +2693,5 @@ "オブジェクトは0)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2703,5 +2701,5 @@ "nodes:最小-最大で指定）" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2711,9 +2709,9 @@ "最小値-最大値)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "role:... - リレーション内で指定した役割を持つオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2723,35 +2721,35 @@ "12T14:51:09Z、2009-11-12　や T14:51 等)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - 変更されたオブジェクトすべて" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "選択- 選択されたオブジェクトすべて" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete- すべての不完全なオブジェクト" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - タグの無いオブジェクト全て" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" msgstr "child 式 - 式にマッチしたオブジェクトの全ての子" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" msgstr "parent 式 - 式にマッチしたオブジェクトの全ての親" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "| や ORを、論理和をとるために使う" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2759,5 +2757,5 @@ "場合など）" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2767,12 +2765,12 @@ "えてエスケープしてください。(\\\" 及び \\\\）。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "グループの分類のために ( と ) を使用する。" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2781,38 +2779,51 @@ msgstr "フィルター" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "検索" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "フィルターを登録" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "検索開始" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "検索表現を入力してください" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "\"{0}\"にマッチするものが見つからない" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "''{0}'' を検索しましたが、選択からは何も取り除いていません。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "選択の中に \"{0}\" と一致するものは見つかりませんでした。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2820,5 +2831,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2826,5 +2837,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2832,5 +2843,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2838,5 +2849,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2972,8 +2983,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3115,5 +3126,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3240,11 +3251,11 @@ msgstr[0] "{0} 個のノードを移動" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "オブジェクト ''{0}'' を取り除いた。" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3252,5 +3263,5 @@ msgstr[0] "{0}オブジェクトの削除" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3261,5 +3272,5 @@ "{1} です。" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3296,5 +3307,5 @@ msgstr "リレーション {1} の {0} タグ競合を解決" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3627,6 +3638,6 @@ "い。これは深刻なエラーではなく、作業を継続しても安全と思われます。" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3636,10 +3647,10 @@ msgstr "ID {0} のウェイの結合対象が見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "ID {0} のオブジェクトの結合対象が見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3647,5 +3658,5 @@ msgstr "ID {0} のノードの結合対象が見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3654,5 +3665,5 @@ msgstr "ID {0} のリレーションの結合対象が見つかりません" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3661,78 +3672,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "ID {1} のタイプ {0} の結合対象が見つかりません" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "東" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "H" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "テキスト" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "一代目" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "R" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "A" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "D" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "F" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

有効なフィルタ

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} 件の非表示オブジェクト" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "{0} 件の無効化オブジェクト" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "

フィルタのダイアログを閉じて全オブジェクトを見る。

" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3867,5 +3804,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "背景" @@ -3993,12 +3930,10 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (フランス)" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "UTM２０北測地システム" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4040,5 +3975,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "鉄道" @@ -4059,7 +3994,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4125,7 +4060,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "建物" @@ -4213,5 +4148,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4439,5 +4374,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4749,12 +4684,12 @@ msgstr "ロール {0} は比較ペア {1} に参加していません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "プロパティ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4765,6 +4700,6 @@ msgstr "タグ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4772,6 +4707,6 @@ msgstr "ノード" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4779,9 +4714,9 @@ msgstr "メンバー" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "解決が必要な保留中のタグ競合はありません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4789,5 +4724,5 @@ msgstr[0] "タグ（{0}この衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4795,9 +4730,9 @@ msgstr[0] "解決すべき保留されたタグが {0} 個あります" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "ノード(解決済み)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4806,17 +4741,17 @@ "合はありません。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "ノード(競合あり)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "このウェイのノードリスト内の保留中競合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "メンバー(解決済み)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4826,25 +4761,25 @@ "保留中の競合はありません。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "メンバー(競合あり)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "このリレーションのメンバーリスト内の保留中競合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "保留中のプロパティ競合はありません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "プロパティ(競合あり)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "解決が必要な保留中競合プロパティ" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "競合の解決" @@ -4892,5 +4827,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "自分のバージョン" @@ -4901,5 +4836,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4915,5 +4850,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "相手のバージョン" @@ -4986,5 +4921,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4996,5 +4931,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "下" @@ -5095,62 +5030,9 @@ msgstr "結合したノードがまだ固定されていません。解決コマンドをビルドできません" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "サーバとの通信中にエラー発生
詳細: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "サーバとの通信失敗" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "はい、これも削除を取り消します" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "いいえ、操作をキャンセルします" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -"{0} 件の付加的なノードをウェイ {1} が使用していますがサーバ上から削除されてい" -"ます。

このノードも削除を取り消しますか？" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "追加のノードの削除を取り消しますか？" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -"{0} 件の付加的なプリミティブをリレーション {1} が参照していますがサーバ上から" -"削除されています。

これも削除を取り消しますか？" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "依存するプリミティブの削除を取り消しますか？" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "自分のデータセットのプロパティ、例：ローカルデータセット" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5160,129 +5042,59 @@ "ロパティを置換します。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "相手のデータセットのプロパティ、例：ローカルデータセット" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "座標:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "削除済み状態:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "表示状態:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "参照元：" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(なし)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "削除しました" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "削除されていません" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "表示(サーバ上)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "非表示(サーバ上)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "ローカルバージョンのクローンを残す" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "ローカルデータセットから物理的に削除" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "自分の座標を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "相手の座標を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "異なる座標間の競合を未決にする" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "自分の削除済み状態を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "相手の削除済み状態を残す" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "削除済み状態間の競合を未決にする" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "自分の表示状態を残す" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "はい、id をリセットします" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" -"あなたのローカルバージョンを保持するために、JOSM
はプリミティブ {0} " -"のIDを0にリセットしなければなりません。
次回アップロード時にサーバはこれに" -"新しいIDを
割り当てます。
同意しますか？" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "id を0 にリセット" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "相手の表示状態を残す" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "はい、破棄します" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM はid {0} のあなたのローカルプリミティブをデータセットから
削除" -"しなければなりません。
よろしいですか？" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "データセットから削除" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "表示状態間の競合を未決にする" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5429,5 +5241,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "全て" @@ -5506,7 +5318,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5515,6 +5327,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5711,5 +5523,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5766,25 +5578,25 @@ msgstr "マップ上の選択した要素を、上記リストの選択したアイテムに設定します。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "競合の解決をキャンセルしてダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "解決済みの競合を適用してダイアログを閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "解決を適用" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "強制的に閉じる" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "解決を続ける" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5796,22 +5608,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "競合は完全には解決されていません" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "競合を解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "''{0}'' の競合を解決する" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "オブジェクトにフィルターをかけ、非表示/無効にします。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5824,44 +5636,123 @@ msgstr "追加" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "フィルターを追加。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "フィルターを編集。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "フィルターを削除。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "フィルターを上に移動。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "フィルターを下に移動。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "フィルターを有効化" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "要素を非表示にする" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "反転フィルター" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "フィルターモード" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "ファイルの読み込みエラー" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "東" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "H" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "テキスト" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "一代目" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "R" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "A" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "D" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

有効なフィルタ

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} 件の非表示オブジェクト" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "{0} 件の無効化オブジェクト" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "

フィルタのダイアログを閉じて全オブジェクトを見る。

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -5903,37 +5794,37 @@ msgstr "詳細なオブジェクト情報" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "新しいノードの座標を入力してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "十進経緯度を使う。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "負の値は、西半球（西経）または南半球（南緯）を意味します。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "-90から90の範囲で正しい緯度を入力してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "-90から90の範囲で緯度を入力してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "-180から180の範囲で正しい経度を入力してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "-180から180の範囲で経度を入力してください" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "ダイアログを閉じて新しいノードを作成" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "ダイアログを閉じて、新しいノードを作成しない" @@ -5993,5 +5884,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "リレーション" @@ -6039,10 +5930,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "選択されたリレーションの不完全なメンバーをダウンロード" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "不完全なメンバーをダウンロード" @@ -6106,14 +5997,14 @@ msgstr "選択: 関連:{0}/ウェイ:{1}/ノード:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "選択: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "オブジェクトに内部状態に関して詳細な情報を取得。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "検査" @@ -6821,8 +6712,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6847,6 +6746,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7229,69 +7126,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "名前" @@ -7891,5 +7789,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -7908,6 +7806,5 @@ msgid "Downloading {0} incomplete child of {1} parent relations" msgid_plural "Downloading {0} incomplete children of {1} parent relations" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "{1} 件の親リレーションの {0} 件の不完全な子をダウンロード中" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 @@ -8557,8 +8454,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "タイプ" @@ -8587,6 +8484,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "不明な" @@ -8939,5 +8836,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "競合が検出されました" @@ -9485,4 +9382,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -10016,5 +9914,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "説明" @@ -10064,5 +9962,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10141,23 +10039,23 @@ "外します。" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "データレイヤー {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "ダウンロード領域の外" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "バージョン {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "警告 : バージョン 0.5 に 0.5 と 0.6 のデータが混ざっている" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10165,35 +10063,11 @@ msgstr[0] "検出された競合が {0} 個あります" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"{0} 件の競合が未解決です。

競合リストダイアログをオープンして手動で解" -"決してください。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "クリックしてこのダイアログを閉じ、編集を続ける" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10201,32 +10075,32 @@ msgstr[0] "{0} を削除しました" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0}は以下で構成されています:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "設定解除" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "APIバージョン: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "GPXレイヤーの変換" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "データセット一貫性テスト" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "問題はありませんでした" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "次の問題が見つかりました:" @@ -10892,4 +10766,7 @@ "html>" msgstr "" +"全自動の手順を実行してOSMウェブサイトからアクセストークンを取得してくだ" +"さい。
JOSMはJOSMユーザに代わってOSMウェブサイトにアクセスし、
ユーザを" +"全自動で認証し、アクセストークンを参照します。" #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80 @@ -10901,4 +10778,8 @@ "submitted by JOSM." msgstr "" +"半自動の手順を実行してOSMウェブサイトからアクセストークンを取得してくだ" +"さい。
JOSMは標準的なOAuth要求を出してリクエストトークンとアクセストークン" +"を取得します。
そしてユーザを、外部ブラウザ内のOSMウェブサイトへ切り替えて" +"
その認証を行い、JOSMが出したリクエストトークンを受け取ります。" #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:88 @@ -11384,4 +11265,7 @@ "token." msgstr "" +"アクセストークン ''{0}''で
OSMサーバ ''{0}''にアクセスできません。" +"
アクセストークンは認証されておらず、サーバが拒否しています。このトークン" +"では
このサーバ上で保護されているリソースにアクセスできません。" #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172 @@ -12450,4 +12334,6 @@ "Do you want to keep it?" msgstr "" +"タグ付けプリセットソースを読み込めません: {0}\n" +"そのままにしますか？" #. Should not happen, but at least show message @@ -12455,5 +12341,5 @@ #, java-format msgid "Could not read tagging preset source {0}" -msgstr "" +msgstr "タグ付けプリセットソース {0} を読み込めません" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:86 @@ -12471,4 +12357,6 @@ "it?

Error is: [{1}:{2}] {3}
" msgstr "" +"タグ付けプリセットソースをパースできません: {0}。本当にこれを使用します" +"か？

エラーコード: [{1}:{2}] {3}
" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:96 @@ -12478,4 +12366,7 @@ "really want to use it?

Error is: {1}
" msgstr "" +"タグ付けプリセットソース {0} はロードできますが、エラーがあります。これ" +"を本当に使用しますか？

エラーコード: {1}
" #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:100 @@ -12610,4 +12501,6 @@ "
Please check the spelling of ''{1}'' and validate again." msgstr "" +"OSMのAPIサーバ認証用URL ''{0}'' の作成に失敗。
''{1}'' のスペルを" +"チェックして、再度認証してください。" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91 @@ -12894,5 +12787,5 @@ #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:565 msgid "count" -msgstr "" +msgstr "件数" #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:566 @@ -13272,4 +13165,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14833,5 +14727,5 @@ "は失敗です。

エラーメッセージ:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15120,5 +15014,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "アドレスの補間" @@ -15500,5 +15394,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:23 msgid "Advanced settings" -msgstr "" +msgstr "高度な設定" #: ../plugins/buildings_tools/src/buildings_tools/AdvancedSettingsDialog.java:30 @@ -15539,5 +15433,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:54 msgid "Advanced..." -msgstr "" +msgstr "拡張..." #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:65 @@ -15548,5 +15442,5 @@ #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:379 msgid "Point on the corner of the building to start drawing" -msgstr "" +msgstr "建物のコーナーをポイントして描き始める" #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:381 @@ -15556,38 +15450,39 @@ #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:383 msgid "Set width of the building" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +msgstr "建物の幅をセット" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "マルチポリゴン" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "住所" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "新規リレーション作成" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "建物" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "数" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "次へ" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "ストリート" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "住所" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15754,11 +15649,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "地理参照中にイメージ切り抜きを無効化" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." msgstr "リスト中の最初のWMSレイヤを選択。" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." +msgstr "" #. item "Man Made/Pipeline" combo "Type" @@ -15812,7 +15711,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15821,13 +15720,13 @@ msgstr "水域(湖沼)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "シンボル" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15875,32 +15774,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "住所" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "セクション" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "自動キャッシュを有効にする" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "最大キャッシュサイズをMB単位で指定します。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15917,18 +15816,18 @@ "CU_01_ConditionsGenerales_fr.html" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "French cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "可能な場合、キー \"source\" の値を自動化" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "情報ソース" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15936,5 +15835,5 @@ msgstr "元の白い背景をJOSMの設定で定義した色の背景に置き換え" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15943,130 +15842,134 @@ "元の白と黒(すべてのグレーも)を反転します。背景が暗いテキストで役に立ちます。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "複数レイヤーの重ね合わせを許可します。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "WMSレイヤーを透明にします。右が不透明、左が透明です。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "WMSサーバからダウンロードしたデータの周囲に長方形を描画します。" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "画像解像度:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "高解像度(1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "中解像度(800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "低解像度 (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "ベクタイメージ取得倍率:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "より小さい画像を取得してください。(より高品質だがよりメモリを使う)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "固定サイズ正方形（初期値は100メートル）" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "固定サイズ（25～1000メートル）" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "レイヤ:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "クリスチャンの十字架のようなシンボル。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "ラスタイメージ取得倍率:" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "このサイズを超えると古いファイルは自動的に削除されます" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16392,5 +16295,5 @@ msgstr "都道府県 bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -16401,9 +16304,9 @@ "であるべきです" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "キャッシュフォーマットエラー" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -16411,5 +16314,5 @@ "キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "ランベルトゾーンキャッシュエラー" @@ -17693,4 +17596,23 @@ msgstr "画像をドラッグしてY軸方向にサイズ調整" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "入出力例外 \"{0}\" が発生しました。" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17732,9 +17654,4 @@ msgid "Create Stops from a GPX file" msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" -msgstr "入出力例外 \"{0}\" が発生しました。" #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83 @@ -19258,5 +19175,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "その他" @@ -19443,5 +19360,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "マルチポリゴン" @@ -19964,5 +19881,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "領域" @@ -20008,34 +19925,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "画像なし" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -20059,7 +19979,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "タグ付いていないウェイ" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20884,7 +20803,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:23 -#, fuzzy msgid "Abort file chooser dialog" -msgstr "タグ編集を中断してダイアログを閉じる" +msgstr "" #. Strings in JFileChooser @@ -20996,7 +20914,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "選択したファイルを開く。" +msgstr "" #. Strings in JFileChooser @@ -21306,7 +21223,14 @@ msgstr "変更セットを元に戻すプラグイン" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21318,10 +21242,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "ルーティング能力の提供" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21330,5 +21254,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21339,15 +21263,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "現在のGPS位置上にマーカー/ノードの追加を許可" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "表形式でタグ編集のダイアログ・ボックスを提供" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21360,10 +21284,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "1つのブロックからテラスハウスを作成する" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21372,5 +21296,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21379,5 +21303,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21386,10 +21310,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "OSMデータベースからの削除取消を許可" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21400,5 +21324,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21408,5 +21332,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21417,15 +21341,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "長い相互接続されたウェイのセットに沿って簡単にダウンロード" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21434,5 +21358,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21565,5 +21489,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "道路番号" @@ -22102,5 +22026,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "金属" @@ -22113,5 +22037,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "森" @@ -22416,8 +22340,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "はい" @@ -22528,8 +22452,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "いいえ" @@ -22835,5 +22759,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "敷地内道路" @@ -22953,5 +22877,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "ハイキング" @@ -23100,4 +23024,9 @@ msgid "Edit Motorway Junction" msgstr "自動車専用道路ジャンクションの編集" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "数" #. item "Waypoints/Motorway Junction" text "Number" @@ -23150,13 +23079,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "操作員" @@ -23424,6 +23353,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "高度" @@ -24278,5 +24207,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "電圧" @@ -24647,24 +24576,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "営業時間" @@ -24731,23 +24660,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24/7" @@ -24761,23 +24690,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "月-金 08:30-20:00" @@ -24791,23 +24720,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "火-日 08:00-15:00; 土 08:00-12:00" @@ -24921,6 +24850,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "参照番号" @@ -24936,5 +24865,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "地下" @@ -24948,5 +24877,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "料金" @@ -25122,5 +25051,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "車いす" @@ -25158,5 +25087,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "避難所" @@ -25164,5 +25093,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "ベンチ" @@ -25281,5 +25210,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "ビーコン" @@ -26018,5 +25947,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "スポーツ" @@ -26091,5 +26020,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -26203,12 +26180,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26275,12 +26244,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26294,12 +26255,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -26461,5 +26414,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "スポーツ" @@ -26486,4 +26440,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "オーストラリアフットボール" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "オーストラリアフットボール" @@ -26511,4 +26471,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "オーストラリアフットボール" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "カヌー" @@ -26551,6 +26517,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "フットボール" +#, fuzzy +msgid "gaelic_football" +msgstr "オーストラリアフットボール" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26591,5 +26558,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "ラグビー" @@ -26710,6 +26683,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26723,5 +26700,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26743,4 +26719,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "タイプ" @@ -26764,6 +26742,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26776,5 +26758,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26796,4 +26777,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "運動場" @@ -26816,4 +26799,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "スポーツセンター" @@ -26836,4 +26821,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "スタジアム" @@ -26856,4 +26843,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "トラック" @@ -27055,108 +27044,153 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "フットボール" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "フットボール場の編集" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "オーストラリアフットボール" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "オーストラリアフットボールの編集" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "オーストラリアフットボール" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "オーストラリアフットボールの編集" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "フットボール場の編集" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "オーストラリアフットボールの編集" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "フットボール場の編集" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "フットボール場の編集" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "ラグビー場の編集" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "ラグビー" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "ラグビー場の編集" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "野球" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "野球場の編集" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "バスケットボール" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "バスケットボール場の編集" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "ゴルフ" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "ゴルフの編集" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "ゴルフコース" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "ペタンク" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "（ペタンクの）ブールの編集" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "ボーリング" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "ボーリング場の編集" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "クリケット" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "クリケットの編集" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "クリケットネット" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "クリケットネットの編集" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "クロッケー" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "クロッケーの編集" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "ホッケー" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "ホッケーの編集" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "ペロタ" @@ -27164,50 +27198,41 @@ # ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》. #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "ペロタの編集" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "ラケットボール" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "ラケットボールの編集" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "ラグビー" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "ラグビー場の編集" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "卓球" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "卓球の編集" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "テニス" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "テニスの編集" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "建造物" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "建物" @@ -27215,5 +27240,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "公共の建物" @@ -27221,10 +27246,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "公共の建物の編集" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "役場" @@ -27232,10 +27257,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "役場の編集" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "大使館" @@ -27243,10 +27268,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "大使館の編集" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "裁判所" @@ -27255,10 +27280,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "裁判所の編集" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "刑務所" @@ -27267,10 +27292,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "刑務所の編集" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "警察" @@ -27280,10 +27305,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "警察署・交番の編集" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "消防署" @@ -27292,10 +27317,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "消防署の編集" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "郵便局" @@ -27303,5 +27328,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "郵便局の編集" @@ -27309,15 +27334,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "幼稚園" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "幼稚園の編集" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "学校" @@ -27325,10 +27350,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "学校の編集" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "大学" @@ -27336,10 +27361,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "大学の編集" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "短大" @@ -27347,5 +27372,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "短大の編集" @@ -27353,5 +27378,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "映画館" @@ -27360,10 +27385,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "映画館の編集" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "図書館" @@ -27372,9 +27397,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "図書館の編集" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "美術館" @@ -27382,10 +27407,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "美術館の編集" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "劇場" @@ -27394,10 +27419,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "劇場の編集" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "礼拝所" @@ -27407,5 +27432,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "礼拝所の編集" @@ -27414,6 +27439,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "宗教" @@ -27422,66 +27447,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "バハーイ教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "仏教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "キリスト教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "ヒンズー教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "ジャイナ教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "ユダヤ教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "ムスリム" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "シーク教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "降霊術士、イタコ" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "道教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "ユニテリアン" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "ゾロアスター教" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "宗派" @@ -27490,81 +27515,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "英国教会系" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "バプチスト" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "カトリック" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "福音派" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "ものみの塔、エホバの証人" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "ルター派" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "メソジスト派" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "モルモン" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "ギリシャ正教系" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "ペンテコステ派" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "長老派" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "プロテスタント" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "クエーカー教徒" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "シーア派" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "スンニ派" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "住所" @@ -27573,5 +27598,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "住所情報の編集" @@ -27579,5 +27604,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "番地" @@ -27585,25 +27610,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "家の名前" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "ストリートの名前" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "都市名" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "郵便番号" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "国コード" @@ -27612,5 +27637,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "住所の補間を編集" @@ -27618,61 +27643,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "番地付けルール" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "奇数" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "偶数" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "アルファベット順" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "人工物" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "工場" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "工場の編集" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "タワー" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "タワーの編集" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "塔の種類" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "通信用" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "観察" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "高さ(メートル)" @@ -27680,25 +27705,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "水道塔" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "水道塔の編集" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "ガスタンク" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "ガスタンクの編集" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "灯台" @@ -27706,10 +27731,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "灯台の編集" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "風車" @@ -27717,10 +27742,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "風車の編集" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "パイプライン" @@ -27729,41 +27754,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "パイプラインの編集" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "ガス" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "熱" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "石油" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "下水" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "どれかの実体" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "ロケーション" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "水中" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "地上" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "下水処理場" @@ -27773,10 +27798,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "下水処理場の編集" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "クレーン" @@ -27784,5 +27809,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "クレーンの編集" @@ -27790,10 +27815,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "誘導灯の編集" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "調査ポイント" @@ -27801,10 +27826,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "測点の編集" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "監視カメラ" @@ -27812,23 +27837,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "監視カメラの編集" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "インドア" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "アウトドア" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "公開" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "発電機" @@ -27838,35 +27863,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "発電機の編集" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "風" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "水力発電" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "火力発電" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "原子力" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "石炭" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "太陽光発電" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "変電所" @@ -27875,10 +27900,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "変電所の編集" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "発電サブステーション" @@ -27887,5 +27912,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "配電所の編集" @@ -27893,10 +27918,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "ライン参照" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "送電塔" @@ -27907,23 +27932,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "送電塔の編集" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "送電塔" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "電柱" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "塔の参照番号" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "送電線" @@ -27932,74 +27957,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "送電線の編集" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "線の種類" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "線" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "細い線" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "電線の電流量" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "電力線束のうち良導体の線の数" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "シングル" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "ダブル" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "３" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "４" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "各種設備" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "トイレ" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "制限" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "備考" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "郵便ポスト" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "電話" @@ -28008,5 +28033,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "電話を編集" @@ -28014,5 +28039,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "コイン" @@ -28020,5 +28045,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "備考" @@ -28026,5 +28051,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "電子マネー" @@ -28032,5 +28057,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "デビットカード" @@ -28038,15 +28063,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "クレジットカード" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "テレフォンカード" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "リサイクル" @@ -28055,5 +28080,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "リサイクルステーションの編集" @@ -28061,35 +28086,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "バッテリー" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "カン" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "被服" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "ガラス" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "紙" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "スクラップ金属" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "ゴミ箱" @@ -28097,5 +28122,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "ゴミ箱を編集" @@ -28104,31 +28129,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "背もたれ" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "素材" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "石" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "プラスチック" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "色" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "黒" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "茶" @@ -28207,5 +28232,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -28215,31 +28240,31 @@ msgstr "緑" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "赤" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "青" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "グレー" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "白" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "席の数" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Hunting Stand" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Hunting Standの編集" @@ -28248,30 +28273,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "高さ" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "低い" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "半分" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "完全" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "隠す" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "ロック" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "噴水" @@ -28280,10 +28305,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "噴水の編集" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "飲料水" @@ -28292,10 +28317,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "飲料水の編集" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "消火栓" @@ -28304,5 +28329,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "消火栓を編集" @@ -28310,5 +28335,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "赤ちゃんポスト" @@ -28316,15 +28341,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "赤ちゃんポストの編集" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "店舗" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "カーディーラ" @@ -28332,10 +28357,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "自動車パーツショップの編集" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "自転車屋" @@ -28344,28 +28369,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "自転車ショップの編集" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "スーパーマーケット" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "スーパーマーケットの編集" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "薬品屋" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "薬品屋の編集" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "コンビニエンスストア" @@ -28373,9 +28398,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "コンビニの編集" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "キオスク" @@ -28383,27 +28408,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "キオスクの編集" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "本屋" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "本屋を編集" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "旅行代理店" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "旅行代理店の編集" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "精肉店" @@ -28411,9 +28436,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "精肉店の編集" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "パン屋" @@ -28421,9 +28446,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "パン屋の編集" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "生花店" @@ -28431,18 +28456,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "生花店の編集" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "オーガニック" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "オーガニック（有機）ショップの編集" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "酒屋" @@ -28450,54 +28475,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "酒屋の編集" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "飲料店" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "酒屋(飲み物屋)の編集" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "コンピュータ店" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "コンピュータ店の編集" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "家電店" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "家電店の編集" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "オーディオショップ" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "オーディオショップの編集" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "家具店" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "家具店の編集" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "園芸用品店" @@ -28505,9 +28530,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "園芸用品店の編集" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "金物屋" @@ -28515,9 +28540,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "金物屋の編集" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "DIYショップ" @@ -28525,54 +28550,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "DIYショップの編集" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "文具店" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "文具店の編集" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "美容院" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "美容院の編集" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "靴店" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "靴店の編集" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "おもちゃ屋" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "おもちゃ屋の編集" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "ビデオ" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "ビデオショップの編集" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "クリーニング店" @@ -28580,9 +28605,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "クリーニング店の編集" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "ランドリー" @@ -28590,9 +28615,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "ランドリーの編集" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "アウトドア店" @@ -28600,24 +28625,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "アウトドア店の編集" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "スポーツ店" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "メガネ屋" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "眼鏡屋の編集" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "自動販売機" @@ -28625,5 +28650,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "自動販売機の編集" @@ -28631,97 +28656,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "自動販売機" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "公共_交通_チケット" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "公共輸送計画" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "パーキングチケット" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "食料" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "飲料" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "甘味" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "たばこ" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "写真" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "ペットフード" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "新聞" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "おもちゃ" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "切手" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "携帯の契約" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "プリペイド携帯のチャージ" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "車" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "コンドーム" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "タンポン" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "糞袋" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "決済または会員用カード" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "お金" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "銀行" @@ -28729,14 +28754,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "銀行の編集" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "ATM" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "両替" @@ -28744,5 +28769,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "両替の編集" @@ -28750,15 +28775,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "ATMの編集" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "健康" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "医院" @@ -28766,18 +28791,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "医院の編集" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "歯科医院" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "歯科医院の編集" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "薬局" @@ -28785,5 +28810,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "薬局の編集" @@ -28791,9 +28816,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "調剤薬局" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "病院" @@ -28801,10 +28826,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "病院の編集" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "夜間急病センター" @@ -28813,5 +28838,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "夜間急病センターの編集" @@ -28820,20 +28845,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "ポイント数" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "ポイント名" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "電話番号" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)" @@ -28841,5 +28866,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "動物病院" @@ -28848,64 +28873,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "動物病院の編集" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "地理学" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "地名" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "大陸" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "大陸の編集" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "国(country)" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "国(country)の編集" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "州(state)" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "州(state)の編集" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "地方" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "地方の編集" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "郡" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "郡の編集" @@ -28913,15 +28938,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "市区" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "市区の編集" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "町" @@ -28929,10 +28954,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "町の編集" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "近郊住宅地" @@ -28940,25 +28965,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "近郊住宅地の編集" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "村" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "村の編集" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "小村落" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "小村落の編集" @@ -28966,5 +28991,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "地域" @@ -28972,10 +28997,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "地域の編集" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "島" @@ -28983,10 +29008,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "島の編集" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "小島" @@ -28994,5 +29019,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "小島を編集" @@ -29000,5 +29025,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "洞窟の入口" @@ -29006,10 +29031,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "洞窟の入口の編集" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "山頂" @@ -29017,10 +29042,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "山頂の編集" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "氷河" @@ -29028,10 +29053,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "氷河の編集" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "火山" @@ -29039,70 +29064,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "火山の編集" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "境界線" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "国境" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "国境の編集" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "行政区画" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "行政区画の編集" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Civil境界" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Civil境界の編集" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "地点名" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Political境界の編集" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "国立公園" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "国立公園の境界編集" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "土地利用" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "樹木・林" @@ -29111,15 +29136,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "樹木・林の編集" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "植物の名前" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "森" @@ -29128,5 +29153,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "森の編集" @@ -29134,17 +29159,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "針葉樹" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "広葉樹" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "混合林" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "森林" @@ -29153,14 +29178,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "森の編集" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "自然保護区" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "自然保護区の編集" @@ -29168,25 +29193,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "ガレ場" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "ガレ場の編集" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "低木林" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "低木林の編集" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "山(Fell)" @@ -29194,10 +29219,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "山(Fell)の編集" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "荒れ地" @@ -29205,5 +29230,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "荒れ地の編集" @@ -29211,5 +29236,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "農家の庭" @@ -29218,45 +29243,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "農家の庭の編集" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "農地" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "農地の編集" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "牧草地" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "牧草地の編集" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "ぶどう園" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "ぶどう園の土地利用の編集" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "貸し農園" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "家庭菜園用地の編集" @@ -29264,25 +29289,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "庭園" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "庭園の編集" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "草地" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "草地の編集" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "里山" @@ -29290,10 +29315,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "里山利用区画の編集" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "共有地" @@ -29301,20 +29326,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "共有地の名前" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "公園" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "公園の編集" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "レクレーション広場" @@ -29322,5 +29347,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "レクレーション広場利用区画の編集" @@ -29328,15 +29353,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "住宅エリア" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "住宅用地の編集" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "墓所" @@ -29344,9 +29369,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "（教会・寺院にある）墓所の編集" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "共同墓地" @@ -29354,39 +29379,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "共同墓地の編集" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "小売り商業" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "小売商用地の編集" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "商用" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "商用地の編集" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "工業" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "工業地の編集" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "鉄道用地" @@ -29394,15 +29419,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "鉄道用地の編集" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "軍用" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "軍用地の編集" @@ -29410,50 +29435,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "工事中エリア" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "工事中用地の編集" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "利用されなくなった商業設備" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "利用されなくなった工業地の編集" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "未開発工業地" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "緑地の編集" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "埋め立てゴミ処理地" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "埋め立てゴミ処理地の編集" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "採石場" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "採石場の編集" @@ -29463,5 +29488,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "マルチポリゴンを編集" @@ -29473,5 +29498,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "外側のセグメント" @@ -29479,5 +29504,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "内側のセグメント" @@ -29485,5 +29510,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -29494,5 +29519,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -29500,36 +29525,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -29537,5 +29562,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "右左折制限" @@ -29544,5 +29569,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "右左折制限の編集" @@ -29550,34 +29575,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "通行制限" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "左折禁止" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "右折禁止" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "直進禁止" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "Uターン禁止" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "右折のみ" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "左折のみ" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "直進のみ" @@ -29586,15 +29611,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "ウェイから" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "ノードかウェイを経由して" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "ウェイへ" @@ -29602,5 +29627,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "ルート" @@ -29609,5 +29634,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "ルート編集" @@ -29615,5 +29640,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "ルート種類" @@ -29721,5 +29746,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29730,17 +29755,17 @@ msgstr "自転車" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "バス" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "道" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "フェリー" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "スキー" @@ -29808,5 +29833,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29816,9 +29841,9 @@ msgstr "徒歩" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "トラム" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "迂回路" @@ -29832,10 +29857,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "地下鉄" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "シンボルの説明" @@ -29843,31 +29868,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "ネットワーク" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "ルート状態" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "案" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "代替路" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "一時的" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "接続" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "色 (16進法)" @@ -29876,30 +29901,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "ルートセグメント" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "前のセグメント" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "後方セグメント" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "停止点" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "前方の停止点" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "後方の停止点" @@ -30126,5 +30151,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "破棄された" @@ -33452,11 +33477,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "場所" @@ -33470,5 +33495,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "tiger_data" @@ -33823,4 +33848,112 @@ msgid "Sicily - Italy" msgstr "Sicily - Italy" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "サーバとの通信中にエラー発生
詳細: {0}" + +#~ msgid "Communication with server failed" +#~ msgstr "サーバとの通信失敗" + +#~ msgid "Yes, undelete them too" +#~ msgstr "はい、これも削除を取り消します" + +#~ msgid "No, cancel operation" +#~ msgstr "いいえ、操作をキャンセルします" + +#~ msgid "" +#~ "There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgid_plural "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" +#~ msgstr[0] "" +#~ "{0} 件の付加的なノードをウェイ {1} が使用していますがサーバ上から削除され" +#~ "ています。

このノードも削除を取り消しますか？" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "追加のノードの削除を取り消しますか？" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "{0} 件の付加的なプリミティブをリレーション {1} が参照していますがサーバ上" +#~ "から削除されています。

これも削除を取り消しますか？" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "依存するプリミティブの削除を取り消しますか？" + +#~ msgid "Visible State:" +#~ msgstr "表示状態:" + +#~ msgid "visible (on the server)" +#~ msgstr "表示(サーバ上)" + +#~ msgid "not visible (on the server)" +#~ msgstr "非表示(サーバ上)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "ローカルバージョンのクローンを残す" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "ローカルデータセットから物理的に削除" + +#~ msgid "Keep my visible state" +#~ msgstr "自分の表示状態を残す" + +#~ msgid "Yes, reset the id" +#~ msgstr "はい、id をリセットします" + +#~ msgid "" +#~ "To keep your local version, JOSM
has to reset the id of " +#~ "primitive {0} to 0.
On the next upload the server will assign
it a " +#~ "new id.
Do you agree?" +#~ msgstr "" +#~ "あなたのローカルバージョンを保持するために、JOSM
はプリミティブ " +#~ "{0} のIDを0にリセットしなければなりません。
次回アップロード時にサーバ" +#~ "はこれに新しいIDを
割り当てます。
同意しますか？" + +#~ msgid "Reset id to 0" +#~ msgstr "id を0 にリセット" + +#~ msgid "Keep their visible state" +#~ msgstr "相手の表示状態を残す" + +#~ msgid "Yes, purge it" +#~ msgstr "はい、破棄します" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM はid {0} のあなたのローカルプリミティブをデータセットから
削" +#~ "除しなければなりません。
よろしいですか？" + +#~ msgid "Remove from dataset" +#~ msgstr "データセットから削除" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "表示状態間の競合を未決にする" + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "{0} 件の競合が未解決です。

競合リストダイアログをオープンして手動で" +#~ "解決してください。" + +#~ msgid "football" +#~ msgstr "フットボール" + +#~ msgid "Football" +#~ msgstr "フットボール" #~ msgid "Move" Index: /applications/editors/josm/i18n/po/nb.po =================================================================== --- /applications/editors/josm/i18n/po/nb.po (revision 22208) +++ /applications/editors/josm/i18n/po/nb.po (revision 22209) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-23 22:38+0000\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-28 16:31+0000\n" "Last-Translator: Stian Ellingsen \n" "Language-Team: Norwegian Bokmal \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -239,5 +239,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -245,6 +245,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -332,8 +332,7 @@ msgstr "Ikke noe lag som mål" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Legg til node …" @@ -655,5 +654,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1034,5 +1033,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1041,5 +1040,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1176,4 +1175,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "" @@ -1447,6 +1447,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1666,6 +1666,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2286,5 +2284,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2530,10 +2528,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Søk …" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Søk etter objekt." @@ -2541,65 +2539,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Skriv inn søketekst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "erstatt utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "legg til i utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "fjern fra utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "skill mellom store/små bokstaver" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "regulært uttrykk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "Nansens gate – «Nansens» og «gate» i nøkkel eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "\"Nansens gate\" – «Nansens gate» i nøkkel eller navn." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Nan – «Nan» finnes innen navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route – nøkkel «type» med eksakt verdi «route»." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2609,38 +2607,38 @@ "*=value, type=, *=*, *=." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Nan – «Nan» finnes ikke innen navnet." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "oneway? – oneway=yes, true, 1 eller on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: – nøkkel «foot» med hvilken som helst verdi." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Spesialsøk:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" msgstr "type: – type objekt (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:… – alle objekter redigert av angitt bruker" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2648,5 +2646,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2654,5 +2652,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2660,5 +2658,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2666,9 +2664,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2676,21 +2674,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified – alle endrede objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected – alle objekter i utvalg" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete – alle uferdige objekter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged – alle objekter uten egenskaper" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2698,5 +2696,5 @@ "child uttrykk – alle underobjekter av objektene i uttrykket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2704,13 +2702,13 @@ "parent uttrykk – alle overobjekter av objektene i uttrykket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "Bruk | eller OR for søk med logisk eller" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2718,12 +2716,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Bruk ( og ) for å gruppere uttrykk" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2732,38 +2730,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Start søk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "regulært uttrykk" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Fant ingen treff for «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Ingenting lagt til utvalg ved søk etter «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Ingenting fjernet fra utvalg ved søk etter «{0}»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2771,5 +2782,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2777,5 +2788,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2783,5 +2794,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2789,5 +2800,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2912,8 +2923,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3052,5 +3063,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3179,11 +3190,11 @@ msgstr[1] "Flytt {0} noder" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3192,5 +3203,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3201,5 +3212,5 @@ "er {1}." -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3237,5 +3248,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3546,6 +3557,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3555,10 +3566,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3566,5 +3577,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3573,5 +3584,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3579,78 +3590,4 @@ #, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "tekst" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -3782,5 +3719,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "bakgrunn" @@ -3950,5 +3887,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "jernbane" @@ -3969,7 +3906,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4036,7 +3973,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "bygning" @@ -4125,5 +4062,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4346,5 +4283,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4644,12 +4581,12 @@ msgstr "rolle {0} deltar ikke i sammenlikningspar {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4660,6 +4597,6 @@ msgstr "Egenskaper" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4667,6 +4604,6 @@ msgstr "Noder" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4674,9 +4611,9 @@ msgstr "Medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Ingen gjenværende egenskapskonflikter å løse" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4685,5 +4622,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4692,9 +4629,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Noder (løst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4703,17 +4640,17 @@ "linjas nodeliste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Noder (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Gjenværende konflikter i denne linjas nodeliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Medlemmer (løst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4723,25 +4660,25 @@ "denne relasjonens medlemsliste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Medlemmer (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Gjenværende konflikter i denne relasjonens medlemsliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Ingen gjenværende egenskapskonflikter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Egenskaper (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Gjenværende egenskapskonflikter å løse" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Konfliktløsning" @@ -4787,5 +4724,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Lokal versjon" @@ -4796,5 +4733,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4810,5 +4747,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Tjenerversjon" @@ -4893,5 +4830,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4903,5 +4840,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Ned" @@ -5004,62 +4941,9 @@ msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" -"Det oppstod en feil under kommunikasjon med tjeneren.
Detaljer: {0}" -"" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Kommunikasjon med tjener feilet" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Ja, gjenopprett også dem" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "Nei, avbryt operasjonen" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Gjenopprette ytterligere noder?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Gjenopprette avhengige objekter?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Egenskaper i det lokate datasettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5069,126 +4953,59 @@ "elementer når sammenslåingsvalgene tas i bruk." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Egenskaper i tjenerens datasett" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Koordinater:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Slettestatus:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Synlighetsstatus:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(ingen)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "slettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "ikke slettet" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "synlig (på tjeneren)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "ikke synlig (på tjeneren)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Behold en klone av den lokale versjonen" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Slett fra det lokale datasettet" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Behold lokale koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Behold tjenerens koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "Fjern avgjørelse fra koordinatkonflikt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "Behold lokal slettestatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "Behold tjenerens slettestatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "Fjern avgjørelse fra slettekonflikt" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "Behold lokal synlighetsstatus" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Ja, nullstill ID" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "Nullstill ID" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Behold tjenerens synlighetsstatus" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Ja, rydd ut objektet" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM må fjerne lokalt element med ID {0} fra datasettet.
Er dette " -"OK?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Fjern fra datasett" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "Fjern avgjørelse fra visningskonflikt" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5335,5 +5152,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "alle" @@ -5413,7 +5230,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5423,6 +5240,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5608,5 +5425,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5662,25 +5479,25 @@ msgstr "Sett valgte kartobjekt til det som er valgt i lista ovenfor." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Avbryt konfliktløsning og lukk vinduet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Ta i bruk løste konflikter og lukk vinduet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Bruk løsninger" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Lukk likevel" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Fortsett å løse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5692,22 +5509,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Løs konflikter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5720,43 +5537,122 @@ msgstr "Legg til" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 +msgid "Enable filter" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 +msgid "Hide elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 -msgid "Enable filter" +msgid "Inverse filter" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 -msgid "Hide elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 -msgid "Inverse filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 msgid "Filter mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Feil ved lasting av fil" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "tekst" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5799,37 +5695,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Angi koordinatene for den nye noden." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Bruk desimalgrader." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negative verdier betegner den vestlige/sørlige hemisfæren." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Venligst velg en gyldig breddegrad i området -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Venligst velg en breddegrad i området -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Venligst velg en gyldig lengdegrad i området -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Venligst velg en lengdegrad i området -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Lukk dialogen og opprett et nytt punkt." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Lukk dialogen og ikke opprett et nytt punkt." @@ -5889,5 +5785,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relasjoner" @@ -5935,10 +5831,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -6002,14 +5898,14 @@ msgstr "Valgt: Rel.:{0} / Linjer:{1} / Noder:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Utvalg: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6710,8 +6606,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6736,6 +6640,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7118,69 +7020,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Navn" @@ -7758,5 +7661,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8396,8 +8299,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Type" @@ -8426,6 +8329,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "ukjent" @@ -8757,5 +8660,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Konflikter avdekkeet" @@ -9277,4 +9180,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9774,5 +9678,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Beskrivelse" @@ -9823,5 +9727,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -9900,23 +9804,23 @@ "utelatt." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Datalag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "utenfor nedlastet område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "versjon {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 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" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9925,34 +9829,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -9961,32 +9842,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "ikke satt" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "API versjon: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Konvertér til GPX-lag" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -12936,4 +12817,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14400,5 +14282,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14669,5 +14551,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Interpoler adresser" @@ -15101,36 +14983,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Multipolygon" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "adresse" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Oprett ny relasjon" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Bygninger" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Nummer" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Neste" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Adresser" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15288,10 +15171,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15346,7 +15233,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15355,13 +15242,13 @@ msgstr "vann" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15409,32 +15296,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "adresse" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Aktiviser automatisk mellomlager." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Max. lager størrelse (i MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15451,9 +15338,9 @@ "
før du laster inn data med dette programtillegget." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "Fransk cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -15461,10 +15348,10 @@ "html>" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Kilde" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15473,5 +15360,5 @@ "Bytt ut original hvit bacgrunn med fargen angitt i innstillingene for JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15481,131 +15368,135 @@ "tekst på mørk bakgrunn." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Tillat stabling av flere lag" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "Sett transperens på WMS lag. Høyre: opak, venstre: transparent." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Trekk et rektangel rundt data lastet ned fra WMS-tjener." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Hent mindre bilder (høyere kvalitet men minnekrevende)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "Fast kvadrat størrelse (standard er 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Fast størrelse (fra 25 til 1000 meter)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" "De eldste filene blir automatisk slettet når denne størrelsen overskrides" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15912,5 +15803,5 @@ msgstr "Kommune avgrensing: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -15921,9 +15812,9 @@ "Create a new one." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Feil i mellomlager format" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -15931,5 +15822,5 @@ "Lambert-sone {0} i hurtiglager ikke kompatibel med gjeldende Lambert-sone {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "Feil Lambert sone på mellomlager" @@ -17210,4 +17101,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17248,9 +17158,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -18763,5 +18668,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Annet" @@ -18947,5 +18852,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Multipolygon" @@ -19468,5 +19373,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "område" @@ -19509,34 +19414,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Ingen data" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19559,7 +19467,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Linjer uten egenskaper" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20476,7 +20383,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Åpne en fil." +msgstr "" #. Strings in JFileChooser @@ -20778,7 +20684,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20789,10 +20702,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Gir deg Ruteplanlegger på OSM data." #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20801,5 +20714,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20810,15 +20723,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Legger inn markører eller Noder på gps posisjon." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Dialog for å redigere egenskaper i en tabell." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20831,10 +20744,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "Lager rekkehus / terassehus fra en enkel husblokk." #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20843,5 +20756,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20850,5 +20763,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20857,10 +20770,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20871,5 +20784,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20879,5 +20792,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20886,15 +20799,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier." #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20903,5 +20816,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21034,5 +20947,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Veinummer" @@ -21571,5 +21484,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "" @@ -21582,5 +21495,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "skogsområde" @@ -21885,8 +21798,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "ja" @@ -21997,8 +21910,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "nei" @@ -22304,5 +22217,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "adkomstvei" @@ -22422,5 +22335,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "tur" @@ -22569,4 +22482,9 @@ msgid "Edit Motorway Junction" msgstr "Rediger motorveikryss" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Nummer" #. item "Waypoints/Motorway Junction" text "Number" @@ -22619,13 +22537,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operatør" @@ -22893,6 +22811,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Høyde" @@ -23744,5 +23662,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Spenning" @@ -24113,24 +24031,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Åpningstider" @@ -24197,23 +24115,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "" @@ -24227,23 +24145,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "" @@ -24257,23 +24175,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -24387,6 +24305,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Referansenummer" @@ -24402,5 +24320,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "P-kjeller" @@ -24414,5 +24332,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Gebyr" @@ -24588,5 +24506,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Rullestol" @@ -24624,5 +24542,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Ly" @@ -24630,5 +24548,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Benk" @@ -24747,5 +24665,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Fyrlykt" @@ -25484,5 +25402,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Sport" @@ -25557,5 +25475,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25669,12 +25635,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25741,12 +25699,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25760,12 +25710,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -25927,5 +25869,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "sport" @@ -25952,4 +25895,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "australsk fotball" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "australsk fotball" @@ -25977,4 +25926,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "australsk fotball" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "kano" @@ -26017,6 +25972,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "football" +#, fuzzy +msgid "gaelic_football" +msgstr "australsk fotball" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26057,5 +26013,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "rugby" @@ -26176,6 +26138,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26189,5 +26155,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26209,4 +26174,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "type" @@ -26230,6 +26197,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26242,5 +26213,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26262,4 +26232,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "bane" @@ -26282,4 +26254,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "sportssenter" @@ -26302,4 +26276,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "stadion" @@ -26322,4 +26298,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -26521,158 +26499,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Amerikansk fotball" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Rediger amerikansk fotball" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Australsk fotball" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Rediger australsk fotball" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Australsk fotball" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Rediger australsk fotball" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Rediger amerikansk fotball" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Rediger australsk fotball" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Rediger amerikansk fotball" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Rediger amerikansk fotball" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Rediger rugby" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Rediger rugby" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Rediger baseball" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Rediger basketball" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Rediger golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "golfbane" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Rediger boule" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Bowls" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Rediger bowls" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Rediger cricket" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Cricketnett" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Rediger cricketnett" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Krocket" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Rediger krocket" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Ishockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Rediger ishockey" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Rediger pelota" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Racquet" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Rediger racquet" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Rediger rugby" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Bordtennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Rediger bordtennis" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Rediger tennis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Menneskeskapt" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Bygning" @@ -26680,5 +26694,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Offentlig bygning" @@ -26686,10 +26700,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Rediger offentlig bygning" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Rådhus" @@ -26697,10 +26711,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Rediger rådhus" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Ambassade" @@ -26708,10 +26722,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Rediger ambassade" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Domstol" @@ -26720,10 +26734,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Rediger domstol" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Fengsel" @@ -26732,10 +26746,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Rediger fengsel" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Politi" @@ -26745,10 +26759,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Rediger politi" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Brannstasjon" @@ -26757,10 +26771,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Rediger brannstasjon" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Postkontor" @@ -26768,5 +26782,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Rediger postkontor" @@ -26774,15 +26788,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Barnehage" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Rediger barnehage" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Skole" @@ -26790,10 +26804,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Rediger skole" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Universitet" @@ -26801,10 +26815,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Rediger universitet" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Høyskole" @@ -26812,5 +26826,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Rediger høyskole" @@ -26818,5 +26832,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Kino" @@ -26825,10 +26839,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Rediger kino" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Bibliotek" @@ -26837,9 +26851,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Rediger bibliotek" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Kunstsenter" @@ -26847,10 +26861,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Rediger kunstsenter" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Teater" @@ -26859,10 +26873,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Rediger teater" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Tilbedelsessted" @@ -26872,5 +26886,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Rediger tilbedelsessted" @@ -26879,6 +26893,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Religion" @@ -26887,66 +26901,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "buddhist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "kristen" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "jødisk" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "muslim" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "unitarisk" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zoroastrisk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Trosretniing" @@ -26955,81 +26969,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglikansk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "katolsk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "evangelisk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "Jehovas vitner" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "luthersk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "metodist" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormoner" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "ortodoks" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "pinsebevegelsen" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "presbyteriansk" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestant" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "shia" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "sunni" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Adresser" @@ -27038,5 +27052,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Rediger adresseinformasjon" @@ -27044,5 +27058,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Husnummer" @@ -27050,25 +27064,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Husnavn" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Gatenavn" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "By/sted" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Postnummer" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Landskode" @@ -27077,5 +27091,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Rediger interpolasjon" @@ -27083,61 +27097,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Nummereringsmåte" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "oddetall" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "partall" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "alfabetisk" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Menneskeskapt" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Fabrikk" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Rediger fabrikk" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Tårn" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Rediger tårn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Høyde (meter)" @@ -27145,25 +27159,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Vanntårn" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Rediger vanntårn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Gassbeholder" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Rediger gassbeholder" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Fyrtårn" @@ -27171,10 +27185,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Rediger fyrtårn" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Vindmølle" @@ -27182,10 +27196,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Rediger vindmølle" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Rørledning" @@ -27194,41 +27208,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Rediger rørledning" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "gass" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Område" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Kloakkrenseanlegg" @@ -27238,10 +27252,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Rediger kloakkrenseanlegg" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Kran" @@ -27249,5 +27263,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Rediger kran" @@ -27255,10 +27269,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Rediger fyrlykt" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Trigonometrisk punkt" @@ -27266,10 +27280,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Rediger trigonometrisk punkt" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Overvåkingskamera" @@ -27277,23 +27291,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Rediger overvåkingskamera" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Kraftverk" @@ -27303,35 +27317,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Rediger kraftverk" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "vind" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "vann" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fossil" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "atom" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "kull" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "solcelle" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Kraftstasjon" @@ -27340,10 +27354,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Rediger kraftstasjon" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Transformatorstasjon" @@ -27352,5 +27366,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Rediger transformatorstasjon" @@ -27358,10 +27372,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Linjenummer" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Kraftmast" @@ -27372,23 +27386,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Rediger kraftmast" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Kraftlinje" @@ -27397,74 +27411,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Rediger kraftlinje" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Fasiliteter" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Toaletter" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "begrenset" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Kommentar" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Postkasse" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telefon" @@ -27473,5 +27487,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Rediger telefon" @@ -27479,5 +27493,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Mynter" @@ -27485,5 +27499,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Sedler" @@ -27491,5 +27505,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Elektronisk lommebok eller betalingskort" @@ -27497,5 +27511,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Bankkort" @@ -27503,15 +27517,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Kredittkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Telefonkort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Returstasjon" @@ -27520,5 +27534,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Rediger returstasjon" @@ -27526,35 +27540,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Batterier" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Bokser" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Klær" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Glass" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Papir" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Metall" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "Søppeldunk" @@ -27562,5 +27576,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Rediger søppeldunk" @@ -27569,31 +27583,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "Ryggstø" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Material" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "stein" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "plast" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Farge" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "svart" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "brun" @@ -27672,5 +27686,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27680,31 +27694,31 @@ msgstr "grønn" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "rød" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "blå" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "grå" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "hvit" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Antall seter" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Jaktpost" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Rediger jaktpost" @@ -27713,30 +27727,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Høyde" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "lav" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "halv" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "full" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Skjul" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Lås" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Fontene" @@ -27745,10 +27759,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Rediger fontene" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Drikkevann" @@ -27757,10 +27771,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Rediger drikkevann" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Hydrant" @@ -27769,5 +27783,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Rediger hydrant" @@ -27775,5 +27789,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Babyboks" @@ -27781,15 +27795,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Rediger babyboks" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Butikker" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Bilforretning" @@ -27797,10 +27811,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Rediger bilforretning" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Sykkelforretning" @@ -27809,28 +27823,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Rediger sykkelforretning" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermarked" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Rediger supermarked" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Hygiene" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Rediger hygiene" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Minimarked" @@ -27838,9 +27852,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Rediger minimarked" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Kiosk" @@ -27848,27 +27862,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Rediger kiosk" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Bokhandel" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Rediger bokhandel" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Reisebyrå" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Rediger reisebyrå" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Slakter" @@ -27876,9 +27890,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Rediger slakter" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Baker" @@ -27886,9 +27900,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Rediger baker" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Blomster" @@ -27896,18 +27910,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Rediger blomster" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Økologisk" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Rediger økologisk" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Sprit og vin" @@ -27915,54 +27929,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Rediger sprit og vin" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Drikke" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Rediger drikke" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Dataelektronikk" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Rediger dataelektronikk" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Elektronikk" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Rediger elektronikk" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Rediger hifi" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Møbler" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Rediger møbler" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Hagesenter" @@ -27970,9 +27984,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Rediger hagesenter" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Jernvarehandel" @@ -27980,9 +27994,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Rediger jernvarehandel" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Byggevare" @@ -27990,54 +28004,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Rediger byggevare" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Kontor" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Rediger kontor" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Frisør" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Rediger frisør" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Sko" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Rediger sko" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Leker" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Rediger leker" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Video" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Rediger video" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Renseri" @@ -28045,9 +28059,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Rediger renseri" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Vaskeri" @@ -28055,9 +28069,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Rediger vaskeri" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Friluftsutstyr" @@ -28065,24 +28079,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Rediger friluftsutstyr" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Rediger sport" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Optiker" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Rediger optiker" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Automat" @@ -28090,5 +28104,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Rediger automat" @@ -28096,97 +28110,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Automatprodukter" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "billetter" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "buss-, trikk- og togkart" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "parkeringsbillett" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "mat" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "drikke" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "godter" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "sigaretter" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "fotografier" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "dyremat" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "aviser" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "leker" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "frimerker" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "telefonkort" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "kuponger" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "sykkelslanger" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "kondomer" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tamponger" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "hundeposer" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "kundekort" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Valuta" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Bank" @@ -28194,14 +28208,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Rediger bank" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Minibank" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Vekslingssted" @@ -28209,5 +28223,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Rediger vekslingssted" @@ -28215,15 +28229,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Rediger minibank" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Helse" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Lege" @@ -28231,18 +28245,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Rediger lege" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Tannlege" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Rediger tannlege" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Apotek" @@ -28250,5 +28264,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Rediger apotek" @@ -28256,9 +28270,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Reseptlevering" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Sykehus" @@ -28266,10 +28280,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Rediger sykehus" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Redningsmøtepunkt" @@ -28278,5 +28292,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Rediger redningsmøtepunkt" @@ -28285,20 +28299,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Punktnummer" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Navn på punkt" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Telefonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)" @@ -28306,5 +28320,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Veterinær" @@ -28313,64 +28327,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Rediger veterinær" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Geografi" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Steder" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Rediger kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Land" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Rediger land" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Delstat/provins" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Rediger delstat/provins" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Rediger region (fylke)" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Kommune" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Rediger kommune" @@ -28378,15 +28392,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Storby" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Rediger storby" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "By" @@ -28394,10 +28408,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Rediger by" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Forstad/bydel" @@ -28405,25 +28419,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Rediger forstad/bydel" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Landsby" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Rediger landsby" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Grend" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Rediger grend" @@ -28431,5 +28445,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Lokalitet" @@ -28437,10 +28451,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Rediger lokalitet" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Øy" @@ -28448,10 +28462,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Rediger øy" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Holme" @@ -28459,5 +28473,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Rediger holme" @@ -28465,5 +28479,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Huleinngang" @@ -28471,10 +28485,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Rediger huleinngang" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Fjelltopp" @@ -28482,10 +28496,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Rediger fjelltopp" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Isbre" @@ -28493,10 +28507,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Rediger isbre" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Vulkan" @@ -28504,70 +28518,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Rediger vulkan" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Grenser" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Nasjonal" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Rediger landegrense" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Fylkesgrense" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Rediger fylkesgrense" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Kommunegrense" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Rediger kommunegrense" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Politisk" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Rediger politisk grense" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Nasjonalpark" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Rediger nasjonalparkgrense" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Bruk av grunn" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Tre" @@ -28576,15 +28590,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Rediger tre" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Botanisk navn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Skogsområde" @@ -28593,5 +28607,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Rediger skogsområde" @@ -28599,17 +28613,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "barskog" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "løvskog" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "blandingsskog" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Skog" @@ -28618,14 +28632,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Rediger skog" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Naturreservat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Rediger naturreservat" @@ -28633,25 +28647,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Steinur" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Rediger steinur" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Krattskog" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Rediger krattskog" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Fjell" @@ -28659,10 +28673,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Rediger fjell" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Beite" @@ -28670,5 +28684,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Rediger beite" @@ -28676,5 +28690,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Gårdstun" @@ -28683,45 +28697,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Rediger gårdstun" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Åkerland" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Rediger åkerland" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Eng" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Rediger eng" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Vingård" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Rediger vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Hageparseller" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Rediger hageparseller" @@ -28729,25 +28743,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Hage" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Rediger hage" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Gress" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Rediger gress" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Friområde" @@ -28755,10 +28769,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Rediger friområde" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Offentlig" @@ -28766,20 +28780,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Rediger offentlig" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Rediger park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Friluftsområde" @@ -28787,5 +28801,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Rediger friluftsområde" @@ -28793,15 +28807,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Boligområde" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Rediger boligområde" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Gravlund" @@ -28809,9 +28823,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Rediger gravlund" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Kirkegård" @@ -28819,39 +28833,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Rediger kirkegård" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Forretninger" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Rediger forretninger" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Næringsområde" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Rediger næringsområde" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Industriområde" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Rediger industriområde" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Jernbanegrunn" @@ -28859,15 +28873,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Rediger jernbanegrunn" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Militært" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Rediger militært" @@ -28875,50 +28889,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Byggeplass" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Rediger byggeplass" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Rivningsområde" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Rediger rivningsområde" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Byggeområde" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Rediger byggeområde" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Avfallsdeponi" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Rediger avfallsdeponi" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Steinbrudd" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Rediger steinbrudd" @@ -28928,5 +28942,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Rediger multipolygon" @@ -28938,5 +28952,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "ytre linjesegment" @@ -28944,5 +28958,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "indre linjesegment" @@ -28950,5 +28964,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "Grense" @@ -28959,5 +28973,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "Rediger grense" @@ -28965,36 +28979,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "Grensetype" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "administrativ" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "nasjonal" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "kommunegrense" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "politisk" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "Administrativt nivå" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "Delområde" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "Administrativt senter" @@ -29002,5 +29016,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Svingeforbud" @@ -29009,5 +29023,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Rediger svingeforbud" @@ -29015,34 +29029,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Forbud" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "venstresving forbudt" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "høyresving forbudt" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "rett frem forbudt" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "u-sving forbudt" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "påbudt høyresving" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "påbudt venstresving" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "påbudt rett frem" @@ -29051,15 +29065,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "fra linje" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "via node eller linje" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "til linje" @@ -29067,5 +29081,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Rute" @@ -29074,5 +29088,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Rediger rute" @@ -29080,5 +29094,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Rutetype" @@ -29186,5 +29200,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29195,17 +29209,17 @@ msgstr "sykkel" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "buss" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "vei" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "ferge" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "ski" @@ -29273,5 +29287,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29281,9 +29295,9 @@ msgstr "fotgjenger" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "trikk" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "omkjøring" @@ -29297,10 +29311,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "T-bane" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Symbolforklaring" @@ -29308,31 +29322,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Nettverk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "Rutetilstand" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "planlagt" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "alternativ" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "midlertidig" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "forbindelse" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Farge (hex)" @@ -29341,30 +29355,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "rutesegment" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "neste segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "forrige segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "stoppepunkt" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "neste stoppunkt" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "forrige stoppunkt" @@ -29591,5 +29605,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "avleggs" @@ -32917,11 +32931,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "sted" @@ -32935,5 +32949,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "tiger-data" @@ -33288,4 +33302,75 @@ msgid "Sicily - Italy" msgstr "Sicilia, Italia" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "Det oppstod en feil under kommunikasjon med tjeneren.
Detaljer: " +#~ "{0}" + +#~ msgid "Communication with server failed" +#~ msgstr "Kommunikasjon med tjener feilet" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Ja, gjenopprett også dem" + +#~ msgid "No, cancel operation" +#~ msgstr "Nei, avbryt operasjonen" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Gjenopprette ytterligere noder?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Gjenopprette avhengige objekter?" + +#~ msgid "Visible State:" +#~ msgstr "Synlighetsstatus:" + +#~ msgid "visible (on the server)" +#~ msgstr "synlig (på tjeneren)" + +#~ msgid "not visible (on the server)" +#~ msgstr "ikke synlig (på tjeneren)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Behold en klone av den lokale versjonen" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Slett fra det lokale datasettet" + +#~ msgid "Keep my visible state" +#~ msgstr "Behold lokal synlighetsstatus" + +#~ msgid "Yes, reset the id" +#~ msgstr "Ja, nullstill ID" + +#~ msgid "Reset id to 0" +#~ msgstr "Nullstill ID" + +#~ msgid "Keep their visible state" +#~ msgstr "Behold tjenerens synlighetsstatus" + +#~ msgid "Yes, purge it" +#~ msgstr "Ja, rydd ut objektet" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM må fjerne lokalt element med ID {0} fra datasettet.
Er " +#~ "dette OK?" + +#~ msgid "Remove from dataset" +#~ msgstr "Fjern fra datasett" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Fjern avgjørelse fra visningskonflikt" + +#~ msgid "football" +#~ msgstr "football" + +#~ msgid "Football" +#~ msgstr "Amerikansk fotball" #~ msgid "Move" Index: /applications/editors/josm/i18n/po/nl.po =================================================================== --- /applications/editors/josm/i18n/po/nl.po (revision 22208) +++ /applications/editors/josm/i18n/po/nl.po (revision 22209) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-23 22:01+0000\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-28 16:08+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Dutch \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:55+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:06+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -246,5 +246,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -252,6 +252,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -340,8 +340,7 @@ msgstr "Geen doel lagen" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Knoop toevoegen..." @@ -666,5 +665,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1049,5 +1048,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1056,5 +1055,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1194,4 +1193,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Knoop Verplaatsen..." @@ -1469,6 +1469,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1690,6 +1690,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2327,5 +2325,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2574,10 +2572,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Zoeken..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Naar objecten zoeken." @@ -2585,65 +2583,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Geef een filter string." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Voer een zoekopdracht in:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Geef de zoekterm" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "Selectie vervangen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "Toevoegen aan selectie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "Verwijderen uit selectie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "zoek in selectie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "Hoofdlettergevoelig" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "Reguliere expressie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "Lange straat - ''Lange'' en ''straat'' in een sleutel of naam." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Lange - ''Lang'' ergens in de naam." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - sleutel ''type'' met exacte waarde ''route''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2653,39 +2651,39 @@ "b>, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Lange - geen ''Lang'' in de naam." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - sleutel=foot, met een willekeurige waarde." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Speciale zoekopdrachten:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" msgstr "type: - objecttype (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "gebruiker:... - alle objecten veranderd door gebruiker" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" "user:anonymous - alle objekten gewijzigd door anonieme gebruikers" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - objekt met opgegeven ID (0 voor nieuwe objekten)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2693,5 +2691,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2699,5 +2697,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2705,5 +2703,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2713,9 +2711,9 @@ "max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2723,21 +2721,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - alle aangepaste objecten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - alle geselecteerde objecten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - alle incomplete objecten" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "ongetagd - alle objecten zonder tag" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2746,5 +2744,5 @@ "voldoen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2753,13 +2751,13 @@ "voldoen" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "Gebruik | of OR om te combineren met een logische OR" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2767,12 +2765,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Gebruik ( en ) om expressies te groeperen" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2781,38 +2779,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Zoeken" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Aktiveer filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Start zoeken" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Geef de zoekterm" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Geen overeenkomst gevonden voor ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Zoeken naar ''{0}'' heeft de selectie niet verkleind." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Niets gevonden in selectie met zoeken op \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2820,5 +2831,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2826,5 +2837,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2832,5 +2843,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2838,5 +2849,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2971,8 +2982,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3115,5 +3126,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3242,11 +3253,11 @@ msgstr[1] "Verplaats {0} knooppunten" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Object \"{0}\" verwijderd" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3255,5 +3266,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3262,5 +3273,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3298,5 +3309,5 @@ msgstr "Los {0} tag conflicten op in relatie {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3612,6 +3623,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3621,10 +3632,10 @@ msgstr "Samenvoeg doel voor weg met id {0} ontbreekt" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Samenvoeg doel voor object met id {0} ontbreekt" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3632,5 +3643,5 @@ msgstr "Samenvoeg doel voor knooppunt met id {0} ontbreekt" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3639,5 +3650,5 @@ msgstr "Samenvoeg doel voor relatie met id {0} ontbreekt" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3646,78 +3657,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "Samenvoeg doel van type {0} met id {1} ontbreekt" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "I" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "tekst" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3848,5 +3785,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "achtergrond" @@ -4016,5 +3953,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "spoorweg" @@ -4035,7 +3972,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4102,7 +4039,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "gebouw" @@ -4191,5 +4128,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4416,5 +4353,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4716,12 +4653,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Eigenschappen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4732,6 +4669,6 @@ msgstr "Tags" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4739,6 +4676,6 @@ msgstr "Knopen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4746,9 +4683,9 @@ msgstr "Leden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Geen tag-conflicten om op te lossen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4757,5 +4694,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4764,26 +4701,26 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Knopen (opgelost)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Knopen (met conflicten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Conflicten in de knopen van deze weg" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Leden (opgelost)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4791,25 +4728,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Leden (met conflicten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Geen eigenschapsconflicten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Eigenschappen (met conflicten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "" @@ -4855,5 +4792,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Mijn versie" @@ -4864,5 +4801,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4876,5 +4813,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Hun versie" @@ -4943,5 +4880,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4953,5 +4890,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Omlaag" @@ -5050,60 +4987,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5111,123 +4997,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Coördinaten:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(geen)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "verwijderd" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "niet verwijderd" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Mijn coördinaten houden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Hun coördinaten houden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" msgstr "" @@ -5375,5 +5196,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "alles" @@ -5453,7 +5274,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5463,6 +5284,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5648,5 +5469,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5706,25 +5527,25 @@ "in de bovenstaande lijst." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Opgeloste conflicten toepassen en dialoog sluiten" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 msgid "Continue resolving" msgstr "Doorgaan met oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5736,22 +5557,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Conflicten oplossen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5764,43 +5585,122 @@ msgstr "Toevoegen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 +msgid "Enable filter" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 +msgid "Hide elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 -msgid "Enable filter" +msgid "Inverse filter" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 -msgid "Hide elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 -msgid "Inverse filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 msgid "Filter mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Laden bestand is mislukt" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "I" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "tekst" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5843,37 +5743,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Coördinaten van de nieuwe knoop invoeren." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Decimale graden gebruiken." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negatieve waarden duiden op het westelijk/zuidelijk halfrond." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Graag een geldige breedtegraad in voeren tussen -90 en 90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Graag een breedtegraad invoeren tussen -90 en 90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Graag een geldige lengtegraad invoeren tussen -180 en 180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Graag een lengtegraad invoeren tussen -180 en 180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Sluit het venster en maak een nieuwe knoop" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Sluit het venster zonder een nieuwe knoop te maken" @@ -5933,5 +5833,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relaties" @@ -5979,10 +5879,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -6046,14 +5946,14 @@ msgstr "Sel.: Rel.:{0} / Wegen:{1} / Knopen:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Selectie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6756,8 +6656,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6782,6 +6690,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7164,69 +7070,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Naam" @@ -7804,5 +7711,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8443,8 +8350,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Soort" @@ -8473,6 +8380,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "onbekend" @@ -8801,5 +8708,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Conflicten gedetecteerd" @@ -9330,4 +9237,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9830,5 +9738,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Beschrijving" @@ -9879,5 +9787,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -9956,23 +9864,23 @@ "kunnen schatten, zijn overgeslagen." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Gegevenslaag {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "buiten gedownload gebied" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "versie {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9981,34 +9889,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10017,32 +9902,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} bestaat uit:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "API-versie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Naar GPX-laag omzetten" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -13004,4 +12889,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14458,5 +14344,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14725,5 +14611,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Adresinterpolatie" @@ -15157,36 +15043,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Multipolygoon" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "adres" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Een nieuwe relatie aanmaken" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Gebouwen" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Nummer" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Volgende" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Adressen" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15340,10 +15227,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15398,7 +15289,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15407,13 +15298,13 @@ msgstr "water" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15461,32 +15352,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "adres" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Automatisch bufferen inschakelen" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Max. buffergrootte (in MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15498,9 +15389,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "Franse kadaster WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -15508,10 +15399,10 @@ "ingeschakeld" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Bron" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15521,5 +15412,5 @@ "in de JOSM-voorkeuren is opgegeven." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15529,9 +15420,9 @@ "tekst op donkere achtergronden." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Stapelen van meerdere lagen toestaan" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -15539,116 +15430,116 @@ "doorzichtig." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Een rechthoek om de gedownloade gegevens van de WMS-server tekenen." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Neem kleinere afbeeldingen (hogere kwaliteit, maar gebruikt meer geheugen)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "Vaste vierkant groote (standaard is 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Vaste groote (van 25 tot 1000 meter)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -15656,8 +15547,12 @@ "overschreden." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15964,5 +15859,5 @@ msgstr "Omvattende reschthoek gemeente: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -15973,14 +15868,14 @@ "Maak een nieuwe aan." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Fout in bufferstructuur" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "Fout in buffer Lambert-zone" @@ -17260,4 +17155,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17298,9 +17212,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -18808,5 +18717,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Andere" @@ -18993,5 +18902,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Multipolygoon" @@ -19521,5 +19430,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "gebied" @@ -19566,34 +19475,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Geen gegevens" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19616,7 +19528,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Ongetagde wegen" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20536,7 +20447,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Een bestand openen." +msgstr "" #. Strings in JFileChooser @@ -20818,7 +20728,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20827,10 +20744,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20839,5 +20756,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20846,15 +20763,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20864,10 +20781,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20876,5 +20793,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20883,5 +20800,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20890,10 +20807,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20902,5 +20819,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20910,5 +20827,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20917,15 +20834,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20934,5 +20851,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21065,5 +20982,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Referentie" @@ -21602,5 +21519,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "" @@ -21613,5 +21530,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "oerbos" @@ -21916,8 +21833,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "ja" @@ -22028,8 +21945,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "nee" @@ -22335,5 +22252,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "toegangsweg" @@ -22453,5 +22370,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "" @@ -22600,4 +22517,9 @@ msgid "Edit Motorway Junction" msgstr "Snelwegkruising bewerken" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Nummer" #. item "Waypoints/Motorway Junction" text "Number" @@ -22650,13 +22572,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Bedrijf" @@ -22924,6 +22846,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Stijging" @@ -23775,5 +23697,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Voltage" @@ -24144,24 +24066,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Openingstijden" @@ -24228,23 +24150,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "" @@ -24258,23 +24180,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "" @@ -24288,23 +24210,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -24418,6 +24340,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Referentienummer" @@ -24433,5 +24355,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "ondergronds" @@ -24445,5 +24367,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Parkeergeld" @@ -24619,5 +24541,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Rolstoel" @@ -24655,5 +24577,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Schuilplaats" @@ -24661,5 +24583,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Bank" @@ -24778,5 +24700,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Baken" @@ -25515,5 +25437,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "" @@ -25588,5 +25510,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25700,12 +25670,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25772,12 +25734,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25791,12 +25745,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -25958,5 +25904,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "sport" @@ -25983,4 +25930,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "Australisch football" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "Australisch football" @@ -26008,4 +25961,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "Australisch football" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "Kanoën" @@ -26048,6 +26007,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "Football" +#, fuzzy +msgid "gaelic_football" +msgstr "Australisch football" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26088,5 +26048,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "Rugby" @@ -26207,6 +26173,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26220,5 +26190,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26240,4 +26209,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "soort" @@ -26261,6 +26232,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26273,5 +26248,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26293,4 +26267,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "Sportveld" @@ -26313,4 +26289,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "Sportcentrum" @@ -26333,4 +26311,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "Stadion" @@ -26353,4 +26333,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -26552,158 +26534,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Football" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Football bewerken" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Australisch football" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Australisch football bewerken" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Australisch football" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Australisch football bewerken" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Football bewerken" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Australisch football bewerken" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Football bewerken" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Football bewerken" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Rugby bewerken" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Rugby bewerken" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Honkbal" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Honkbal bewerken" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Basketball" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Basketball bewerken" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Golf bewerken" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "golfbaan" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Boule bewerken" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Bowlen" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Bowlen bewerken" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Cricket bewerken" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Cricketnetten" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Cricketnetten bewerken" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Croquet bewerken" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Hockey bewerken" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Pelota bewerken" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Badminton" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Badminton bewerken" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Rugby bewerken" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Tafeltennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Tafeltennis bewerken" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Tennis bewerken" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Gebouw" @@ -26711,5 +26729,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Openbare gebouw" @@ -26717,10 +26735,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Openbare gebouwen bewerken" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Stadhuis" @@ -26728,10 +26746,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Stadhuis bewerken" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Ambassade" @@ -26739,10 +26757,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Ambassade bewerken" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Gerechtsgebouw" @@ -26751,10 +26769,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Gerechtsgebouw bewerken" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Gevangenis" @@ -26763,10 +26781,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Gevangenis bewerken" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Politie" @@ -26776,10 +26794,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Politie bewerken" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Brandweerkazerne" @@ -26788,10 +26806,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Brandweerkazerne bewerken" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Postkantoor" @@ -26799,5 +26817,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Postkantoor bewerken" @@ -26805,15 +26823,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Kinderopvang" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Kinderopvang bewerken" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "School" @@ -26821,10 +26839,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "School bewerken" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Universiteit" @@ -26832,10 +26850,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Universiteit bewerken" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Campus" @@ -26843,5 +26861,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Campus bewerken" @@ -26849,5 +26867,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Bioscoop" @@ -26856,10 +26874,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Bioscoop bewerken" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Bibliotheek" @@ -26868,9 +26886,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Bibliotheek bewerken" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Kunstcentrum" @@ -26878,10 +26896,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Kunstcentrum bewerken" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Theater" @@ -26890,10 +26908,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Theater bewerken" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Religieus gebouw" @@ -26903,5 +26921,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Religieus gebouw bewerken" @@ -26910,6 +26928,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Religie" @@ -26918,66 +26936,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "Bahai" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "Boeddhisme" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "Christelijk" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "Hindoestaans" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "Jain" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "Joods" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "Moslim" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "Sikh" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "Spirtualist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "Taoist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Benaming" @@ -26986,81 +27004,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "Anglicaan" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "Baptist" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "Katholiek" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "Evangelist" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "Jehovahs getuigen" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "Luthers" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "Methodist" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "Mormoon" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "Orthodox" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "Protestant" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "Quaker" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Adressen" @@ -27069,5 +27087,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Adresinformatie bewerken" @@ -27075,5 +27093,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Huisnummer" @@ -27081,25 +27099,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Huisnaam" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Straatnaam" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Stadsnaam" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Postcode" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Landcode" @@ -27108,5 +27126,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Adresinterpolatie bewerken" @@ -27114,61 +27132,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Nummeringschema" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "oneven" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "even" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Bouwwerken" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Fabriek" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Fabriek bewerken" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Toren" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Toren bewerken" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "" @@ -27176,25 +27194,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Watertoren" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Watertoren bewerken" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Olieopslag" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Olieopslag bewerken" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Vuurtoren" @@ -27202,10 +27220,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Vuurtoren bewerken" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Windmolen" @@ -27213,10 +27231,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Windmolen bewerken" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Pijplijn" @@ -27225,41 +27243,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Pijplijn bewerken" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "gas" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Locatie" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Afvalzuivering" @@ -27269,10 +27287,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Afvalzuivering bewerken" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Kraan" @@ -27280,5 +27298,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Kraan bewerken" @@ -27286,10 +27304,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Baken bewerken" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Uitkijkpunt" @@ -27297,10 +27315,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Uitkijkpunt bewerken" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Bewakingscamera" @@ -27308,23 +27326,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Bewakingscamera bewerken" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Energievoorziening" @@ -27334,35 +27352,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Energievoorziening bewerken" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "wind" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "water" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fossiele brandstoffen" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "nucleair" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "kolen" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "fotovoltage" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Verdeelstation" @@ -27371,10 +27389,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Verdeelstation bewerken" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Transformatorstation" @@ -27383,5 +27401,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Transformatorstation bewerken" @@ -27389,10 +27407,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Lijnreferentie" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Hoogspanningsmast" @@ -27403,23 +27421,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Hoogspanningsmast bewerken" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Hoogspanningskabel" @@ -27428,74 +27446,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Hoogspanningskabels bewerken" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Voorzieningen" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Toiletten" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Opmerking" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Postbus" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telefoon" @@ -27504,5 +27522,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Een telefoon bewerken" @@ -27510,5 +27528,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Munten" @@ -27516,5 +27534,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Briefgeld" @@ -27522,5 +27540,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Chipknip" @@ -27528,5 +27546,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Pinpas" @@ -27534,15 +27552,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Creditkaart" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Telefoonkaart" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Recycling" @@ -27551,5 +27569,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Recyclebakken" @@ -27557,35 +27575,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Batterijen" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Flessen" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Kleding" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Schroot" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "" @@ -27593,5 +27611,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "" @@ -27600,31 +27618,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "" @@ -27703,5 +27721,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27711,31 +27729,31 @@ msgstr "groen" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Vogeluitkijkpost" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Vogeluitkijkpost bewerken" @@ -27744,30 +27762,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Hoogte" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "Kruiphoogte" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "Bukhoogte" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "Stahoogte" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Verborgen" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Afgesloten" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Fontein" @@ -27776,10 +27794,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Fontein bewerken" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Drinkwater" @@ -27788,10 +27806,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Drinkwater bewerken" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "" @@ -27800,5 +27818,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "" @@ -27806,5 +27824,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "" @@ -27812,15 +27830,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Winkels" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "" @@ -27828,10 +27846,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Winkel met autoonderdelen bewerken" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "" @@ -27840,28 +27858,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Fietswinkel bewerken" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermarkt" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Supermarkt bewerken" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "" @@ -27869,9 +27887,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Kiosk" @@ -27879,27 +27897,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Kiosk bewerken" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Slager" @@ -27907,9 +27925,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Slager bewerken" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Bakker" @@ -27917,9 +27935,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Bakker bewerken" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Bloemist" @@ -27927,18 +27945,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Bloemist bewerken" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "" @@ -27946,54 +27964,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Dranken" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Computer" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Computerwinkel bewerken" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Elektronica" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Elektronicawinkel bewerken" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Hifi-winkel bewerken" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Meubels" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Meubelzaak bewerken" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Tuincentrum" @@ -28001,9 +28019,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Tuincentrum bewerken" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "" @@ -28011,9 +28029,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Doe-het-zelfzaak" @@ -28021,54 +28039,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Doe-het-zelfzaak bewerken" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Kantoorartikelen" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Kantoorartikelenwinkel bewerken" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Kapper" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Kapper bewerken" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Schoenen" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Schoenenwinkel bewerken" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Speelgoed" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Speelgoedwinkel bewerken" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Videotheek" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Videotheek bewerken" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Stomerij" @@ -28076,9 +28094,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Stomerij bewerken" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Wasserette" @@ -28086,9 +28104,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Wasserette bewerken" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Buitensport" @@ -28096,24 +28114,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Buitensportzaak bewerken" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Sportzaak bewerken" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Opticiën bewerken" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Verkoopautomaat" @@ -28121,5 +28139,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Verkoopautomaat bewerken" @@ -28127,97 +28145,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Producten" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "vervoerskaarten" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "overzichtskaart" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "parkeerbiljet" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "voedsel" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "frisdranken" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "snoepgoed" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "sigaretten" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "foto's" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "diervoeder" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "kranten" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "speelgoed" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "postzegels" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-kaarten" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "prepaid-kaarten" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "tegoedbonnen" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "condooms" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tampons" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "hondenpoepzakjes" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "Klantenkaarten" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Geldzaken" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Bank" @@ -28225,14 +28243,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Bank bewerken" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Geldautomaat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Geldwisselkantoor" @@ -28240,5 +28258,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Geldwisselkantoor bewerken" @@ -28246,15 +28264,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Geldautomaat bewerken" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Gezondheid" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Huisarts" @@ -28262,18 +28280,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Huisarts bewerken" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Tandarts" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Tandarts bewerken" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Apotheek" @@ -28281,5 +28299,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Apotheek bewerken" @@ -28287,9 +28305,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Ziekenhuis" @@ -28297,10 +28315,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Ziekenhuis bewerken" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "EHBO-post" @@ -28309,5 +28327,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "EHBO-post bewerken" @@ -28316,20 +28334,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Puntnummer" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Telefoonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Gebruik de landtoegangscode, b.v. +31 20-3456789)" @@ -28337,5 +28355,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Dierenarts" @@ -28344,64 +28362,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Dierenarts bewerken" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Locaties" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Continent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Een continent bewerken" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Land" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Land bewerken" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Provincie" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Provincie bewerken" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Regio" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Regio bewerken" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "" @@ -28409,15 +28427,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Stad" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Stad bewerken" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Dorp" @@ -28425,10 +28443,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Dorp bewerken" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Deelgemeente" @@ -28436,25 +28454,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Deelgemeente bewerken" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Klein dorp" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Klein dorp bewerken" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Gehucht" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Gehucht bewerken" @@ -28462,5 +28480,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "" @@ -28468,10 +28486,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Eiland" @@ -28479,10 +28497,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Eiland bewerken" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "" @@ -28490,5 +28508,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "" @@ -28496,5 +28514,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Grotingang" @@ -28502,10 +28520,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Grotingang bewerken" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Bergtop" @@ -28513,10 +28531,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Bergtop bewerken" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Gletsjer" @@ -28524,10 +28542,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Gletsjer bewerken" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Vulkaan" @@ -28535,70 +28553,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Vulkaan bewerken" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Grenzen" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Landsgrens" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Landsgrens bewerken" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Provincie -of gemeentegrens" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Provincie -of gemeentegrens bewerken" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Grens bebouwde kom" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Grens bebouwde kom bewerken" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Grens kiesdistrict bewerken" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Grens Nationaal park bewerken" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Grondgebruik" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Boom" @@ -28607,15 +28625,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Boom bewerken" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Botanische naam" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Bos" @@ -28624,5 +28642,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Bos bewerken" @@ -28630,17 +28648,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "naaldbomen" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "loofbomen" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "gemengd" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Bosbouw" @@ -28649,14 +28667,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Bosbouw bewerken" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Natuurreservaat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Natuurreservaat bewerken" @@ -28664,25 +28682,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Puinhelling" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Puinhelling bewerken" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Kreupelhout" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Kreupelhout bewerken" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "" @@ -28690,10 +28708,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Heide" @@ -28701,5 +28719,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Heide bewerken" @@ -28707,5 +28725,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Boerenerf" @@ -28714,45 +28732,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Boerenerf bewerken" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Landbouwgrond" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Landbouwgrond bewerken" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Weide" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Weideland bewerken" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Wijngaard" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Wijngaard bewerken" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Volkstuinen" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Volkstuinen bewerken" @@ -28760,25 +28778,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Tuin" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Tuin bewerken" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Gras" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Gras bewerken" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Stadsgroen" @@ -28786,10 +28804,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Stadsgroen bewerken" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Algemeen" @@ -28797,20 +28815,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Algemeen bewerken" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Park bewerken" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Recreatiegebied" @@ -28818,5 +28836,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Recreatiegebied bewerken" @@ -28824,15 +28842,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Woongebied" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Woongebied bewerken" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Begraafplaats" @@ -28840,9 +28858,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Begraafplaats bewerken" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Begraafplaats" @@ -28850,39 +28868,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Begraafplaats bewerken" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Winkelcentrum" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Winkelcentrum bewerken" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Kantoren" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Kantoren bewerken" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Industrieterrein" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Industrieterrein bewerken" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "" @@ -28890,15 +28908,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Militair terrein" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Militair terrein bewerken" @@ -28906,50 +28924,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Bouwterrein" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Bouwterrein bewerken" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Braakliggende grond" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Braakliggende grond bewerken" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Ontwikkelingsgebied" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Ontwikkelingsgebied bewerken" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Vuilstortplaats" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Vuilstortplaats bewerken" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Mijnbouw" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Mijnbouw bewerken" @@ -28959,5 +28977,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Multipolygoon bewerken" @@ -28969,5 +28987,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "buitensegment" @@ -28975,5 +28993,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "binnensegment" @@ -28981,5 +28999,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -28990,5 +29008,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -28996,36 +29014,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -29033,5 +29051,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Verkeersbeperking" @@ -29040,5 +29058,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Verkeersbeperking bewerken" @@ -29046,34 +29064,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Beperking" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "niet linksaf" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "niet rechtsaf" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "niet rechtdoor" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "niet keren" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "alleen rechtsaf" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "alleen linksaf" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "alleen rechtdoor" @@ -29082,15 +29100,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "vanaf weg" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "via knoop of weg" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "naar weg" @@ -29098,5 +29116,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "" @@ -29105,5 +29123,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "" @@ -29111,5 +29129,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "" @@ -29217,5 +29235,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29226,17 +29244,17 @@ msgstr "fiets" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "bus" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "straat" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "veerboot" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "" @@ -29304,5 +29322,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29312,9 +29330,9 @@ msgstr "voet" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "tram" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "omweg" @@ -29328,10 +29346,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "" @@ -29339,31 +29357,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Netwerk" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "voorgesteld" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "alternatief" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "tijdelijk" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "verbinding" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Kleur (hex)" @@ -29372,30 +29390,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "" @@ -29622,5 +29640,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "vervallen" @@ -32948,11 +32966,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "plaats" @@ -32966,5 +32984,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" @@ -33319,4 +33337,10 @@ msgid "Sicily - Italy" msgstr "Sicilië - Italië" + +#~ msgid "football" +#~ msgstr "Football" + +#~ msgid "Football" +#~ msgstr "Football" #~ msgid "Select a bookmark first." Index: /applications/editors/josm/i18n/po/pl.po =================================================================== --- /applications/editors/josm/i18n/po/pl.po (revision 22208) +++ /applications/editors/josm/i18n/po/pl.po (revision 22209) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-25 10:23+0000\n" -"Last-Translator: Paweł Marynowski \n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-29 18:59+0000\n" +"Last-Translator: Rafał \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "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: 2010-06-28 14:49+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:11+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: POLAND\n" @@ -31,5 +31,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -73,5 +73,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -81,5 +81,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -248,5 +248,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -254,6 +254,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -341,8 +341,7 @@ msgstr "Brak warstw docelowych." -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Dodaj węzeł..." @@ -666,5 +665,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1003,5 +1002,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606 msgid "Join Areas: Remove Short Ways" -msgstr "" +msgstr "Połącz obszary: Usuń krótkie drogi" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622 @@ -1051,5 +1050,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1058,5 +1057,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1195,4 +1194,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Przesuń węzeł..." @@ -1472,6 +1472,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1692,6 +1692,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2320,5 +2318,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2564,10 +2562,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Szukaj..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Wyszukuje obiekty." @@ -2575,67 +2573,67 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Podaj ciąg do przefiltrowania." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Podaj ciąg do wyszukania." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Wpisz wyrażenie do wyszukania" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "zamień zaznaczenie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "dodaj do zaznaczenia" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "usuń z zaznaczenia" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "znajdź w zaznaczeniu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "uwzględnij wielkość liter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "wyrażenie regularne" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" "Baker Street - ''Baker'' oraz ''Street'' w dowolnym kluczu lub nazwie." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" "\"Baker Street\" - ''Baker Street'' w dowolnym kluczu lub nazwie." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak - ''Bak'' gdziekolwiek w nazwie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2643,21 +2641,21 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - klucz=foot ustawiony na dowolną wartość" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2665,17 +2663,17 @@ "type: - rodzaj obiektu (node, way, relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - wszystkie obiekty zmienione przez użytkownika" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2683,5 +2681,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2689,5 +2687,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2695,5 +2693,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2701,9 +2699,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2711,39 +2709,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - wszystkie zmienione obiekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - wszystkie zaznaczone obiekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - wszystkie niekompletne obiekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - wszystkie obiekty bez tagów" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "Użyj I lub OR by połączyć logicznym \"lub\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2751,12 +2749,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Użyj ( oraz ) aby pogrupować wyrażenia" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2765,38 +2763,51 @@ msgstr "Filtr" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Szukaj" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Stwórz filtr" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Rozpocznij szukanie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Wpisz szukane wyrażenie" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Nie znaleziono nic szukając ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Niczego nie dodano do zaznaczenia szukając \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Niczego nie usunięto z zaznaczenia szukając \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2804,5 +2815,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2810,5 +2821,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2816,5 +2827,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2822,5 +2833,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2944,8 +2955,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3085,5 +3096,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3158,5 +3169,5 @@ #, java-format msgid "Deleted ''{0}''" -msgstr "" +msgstr "Usunięto \"{0}\"" #. leave message in one tr() as there is a grammatical @@ -3215,11 +3226,11 @@ msgstr[2] "Przesunięto {0} węzłów" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3228,5 +3239,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3235,5 +3246,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3272,5 +3283,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3601,6 +3612,6 @@ "jest krytyczny błąd i powinien być bezpieczny dla kontynuowania pracy." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3610,10 +3621,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3621,5 +3632,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3628,5 +3639,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3635,78 +3646,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "A" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "U" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Tekst" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "O" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "T" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "Z" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "D" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "U" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "Z" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

Filtr aktywny

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} ukrytych obiektów" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "{0} wyłączonych obiektów" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "

Zamknij okno filtrów aby zobaczyć wszystkie obiekty.

" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3840,5 +3777,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "tło" @@ -4008,5 +3945,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "tory kolejowe" @@ -4027,7 +3964,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4095,7 +4032,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "budynek" @@ -4185,5 +4122,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4400,5 +4337,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4711,12 +4648,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4727,6 +4664,6 @@ msgstr "Etykiety" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4734,6 +4671,6 @@ msgstr "Węzły" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4741,9 +4678,9 @@ msgstr "Członkowie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4752,5 +4689,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4759,26 +4696,26 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4786,25 +4723,25 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "" @@ -4850,5 +4787,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Moja wersja" @@ -4859,5 +4796,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4873,5 +4810,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Ich wersja" @@ -4940,5 +4877,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4950,5 +4887,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "W dół" @@ -5050,60 +4987,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5111,123 +4997,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Współrzędne:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Usunięte:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Widoczne:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(brak)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "usunięto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "nie zostały usunięte" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "widoczne (na serwerze)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "nie widoczne (na serwerze)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" msgstr "" @@ -5375,5 +5196,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "wszystkie" @@ -5453,7 +5274,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5464,6 +5285,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5659,5 +5480,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5713,25 +5534,25 @@ msgstr "Zaznacz na mapie elementy zaznaczone na powyższej liście." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Anuluj rozwiązywanie konfliktów i zamknij okno" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5743,22 +5564,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Filtruj obiekty i ukrywaj/blokuj je." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5771,44 +5592,123 @@ msgstr "Dodaj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "Dodaje filtr." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Edytuje filtr." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Usuwa filtr." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Przesuwa filtr do góry." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Przesuwa filtr na dół." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Zastosuj filtr" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Ukryj elementy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Odwróć filtr" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Tryb filtru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "Filtry ukryte:{0}, wyłączone:{1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Błąd podczas ładowania pliku" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "A" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "U" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Tekst" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "O" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "T" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "Z" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "D" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "U" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "Z" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

Filtr aktywny

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} ukrytych obiektów" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "{0} wyłączonych obiektów" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "

Zamknij okno filtrów aby zobaczyć wszystkie obiekty.

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -5850,37 +5750,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Podaj współrzędne nowego węzła." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Użyj stopni dziesiętnych." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Wartości ujemne oznaczają zachodnią/południową półkulę." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Wprowadź prawidłową szerokość geograficzną z zakresu -90..90 stopni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Wprowadź szerokość geograficzną z zakresu -90..90 stopni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Wprowadź prawidłową długość geograficzną z zakresu -180..180 stopni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Wprowadź długość geograficzną z zakresu -180..180 stopni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Zamknij okno i utwórz nowy węzeł" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Zamknij okno, nie twórz nowego węzła" @@ -5940,5 +5840,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relacje" @@ -5986,10 +5886,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "Pobierz niekompletnych członków zaznaczonych relacji" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "Pobierz niekompletnych członków" @@ -6053,14 +5953,14 @@ msgstr "Zazn.: Rel.:{0} / Drogi:{1} / Węzły:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Zaznaczenie: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6764,8 +6664,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6790,6 +6698,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7172,69 +7078,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Nazwa" @@ -7815,5 +7722,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8455,8 +8362,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Rodzaj" @@ -8485,6 +8392,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "nieznany" @@ -8808,5 +8715,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Wykryto konflikty" @@ -9325,4 +9232,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9826,5 +9734,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Opis" @@ -9877,5 +9785,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -9952,23 +9860,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Warstwa danych {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "poza pobranym obszarem" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "wersja {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9978,41 +9886,11 @@ msgstr[2] "Wykryto {0} konfliktów." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"{0} konflikt pozostaje do rozwiązania.

Proszę otworzyć okno " -"Konfliktów aby rozwiązać go ręcznie." -msgstr[1] "" -"{0} konflikty pozostaje do rozwiązania.

Proszę otworzyć okno " -"Konfliktów aby rozwiązać je ręcznie." -msgstr[2] "" -"{0} konfliktów pozostaje do rozwiązania.

Proszę otworzyć okno " -"Konfliktów aby rozwiązać je ręcznie." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "Kliknij aby zamknąć okno i kontynuować edycję" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10021,32 +9899,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "Obiekty na warstwie {0}:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "Wersja API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -12989,4 +12867,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14451,5 +14330,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14632,5 +14511,5 @@ #: build/trans_presets.java:490 msgid "Visibility" -msgstr "" +msgstr "Widoczność" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:137 @@ -14719,5 +14598,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Interpolacja adresów" @@ -15151,36 +15030,35 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 +msgid "on polygon" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "adres" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Utwórz nową relację" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Budynki" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Numer" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +msgid "Next no" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Adresy" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15334,10 +15212,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15392,7 +15274,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15401,13 +15283,13 @@ msgstr "woda" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15455,32 +15337,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "adres" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15492,18 +15374,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "WMS katastru francuskiego" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15511,5 +15393,5 @@ msgstr "Zastąp oryginalne białe tło kolorem zdefiniowanym w ustawieniach JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15517,130 +15399,134 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15941,5 +15827,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -15948,14 +15834,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "" @@ -17219,4 +17105,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17257,9 +17162,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -18761,5 +18661,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Pozostałe" @@ -18948,5 +18848,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "" @@ -19464,5 +19364,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "obszar" @@ -19505,34 +19405,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Brak danych" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19555,7 +19458,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Drogi bez tagów" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20469,7 +20371,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Proszę wybrać plik" +msgstr "" #. Strings in JFileChooser @@ -20751,7 +20652,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20760,10 +20668,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20772,5 +20680,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20779,15 +20687,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20797,10 +20705,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20809,5 +20717,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20816,5 +20724,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20823,10 +20731,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20835,5 +20743,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20843,5 +20751,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20852,15 +20760,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20869,5 +20777,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21000,5 +20908,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Numer" @@ -21537,5 +21445,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "metal" @@ -21548,5 +21456,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "drewno" @@ -21851,8 +21759,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "tak" @@ -21963,8 +21871,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "nie" @@ -22270,5 +22178,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "droga serwisowa" @@ -22388,5 +22296,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "" @@ -22415,21 +22323,21 @@ #: build/trans_presets.java:490 msgid "excellent" -msgstr "" +msgstr "doskonała" #: build/trans_presets.java:490 msgid "good" -msgstr "" +msgstr "dobra" #: build/trans_presets.java:490 build/trans_presets.java:2052 msgid "intermediate" -msgstr "" +msgstr "średnia" #: build/trans_presets.java:490 msgid "bad" -msgstr "" +msgstr "zła" #: build/trans_presets.java:490 msgid "horrible" -msgstr "" +msgstr "tragiczna" #: build/trans_presets.java:499 @@ -22535,4 +22443,9 @@ msgid "Edit Motorway Junction" msgstr "Edycja skrzyżowania autostrad" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Numer" #. item "Waypoints/Motorway Junction" text "Number" @@ -22585,13 +22498,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operator" @@ -22859,6 +22772,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Wysokość" @@ -23710,5 +23623,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Napięcie" @@ -23965,53 +23878,53 @@ #: build/trans_presets.java:1339 msgid "Agip" -msgstr "" +msgstr "Agip" #: build/trans_presets.java:1339 msgid "Aral" -msgstr "" +msgstr "Aral" #: build/trans_presets.java:1339 msgid "Avia" -msgstr "" +msgstr "Avia" #: build/trans_presets.java:1339 msgid "BP" -msgstr "" +msgstr "BP" #: build/trans_presets.java:1339 msgid "Esso" -msgstr "" +msgstr "Esso" #: build/trans_presets.java:1339 msgid "OMV" -msgstr "" +msgstr "OMV" #: build/trans_presets.java:1339 msgid "Q8" -msgstr "" +msgstr "Q8" #: build/trans_presets.java:1339 msgid "Repsol" -msgstr "" +msgstr "Repsol" #: build/trans_presets.java:1339 msgid "Shell" -msgstr "" +msgstr "Shell" #: build/trans_presets.java:1339 msgid "Statoil" -msgstr "" +msgstr "Statoil" #: build/trans_presets.java:1339 msgid "Tamoil" -msgstr "" +msgstr "Tamoil" #: build/trans_presets.java:1339 msgid "Texaco" -msgstr "" +msgstr "Texaco" #: build/trans_presets.java:1339 msgid "Total" -msgstr "" +msgstr "Total" #: build/trans_presets.java:1339 @@ -24079,24 +23992,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Godziny otwarcia" @@ -24163,23 +24076,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "" @@ -24193,23 +24106,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "" @@ -24223,23 +24136,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -24353,6 +24266,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Numer referencyjny" @@ -24368,5 +24281,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "podziemny" @@ -24380,5 +24293,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Opłata" @@ -24554,5 +24467,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Dla niepełnosprawnych" @@ -24590,5 +24503,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "schronienie" @@ -24596,5 +24509,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "ławka" @@ -24713,5 +24626,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "radiolatarnia" @@ -24936,13 +24849,13 @@ #: build/trans_presets.java:1645 build/trans_presets.java:1653 msgid "french" -msgstr "" +msgstr "francuska" #: build/trans_presets.java:1645 build/trans_presets.java:1653 msgid "sandwich" -msgstr "" +msgstr "kanapki" #: build/trans_presets.java:1645 build/trans_presets.java:1653 msgid "sushi" -msgstr "" +msgstr "sushi" #: build/trans_presets.java:1648 @@ -24958,9 +24871,9 @@ #: build/trans_presets.java:1653 msgid "fish_and_chips" -msgstr "" +msgstr "ryba z frytkami" #: build/trans_presets.java:1653 msgid "chicken" -msgstr "" +msgstr "kurczak" #: build/trans_presets.java:1656 @@ -25450,5 +25363,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Sport" @@ -25523,5 +25436,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25635,12 +25596,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25707,12 +25660,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25726,12 +25671,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -25893,5 +25830,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "Sport" @@ -25918,4 +25856,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "futbol australijski" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "futbol australijski" @@ -25943,4 +25887,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "futbol australijski" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "kajakarstwo" @@ -25983,6 +25933,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "futbol amerykański" +#, fuzzy +msgid "gaelic_football" +msgstr "futbol australijski" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26023,5 +25974,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "rugby" @@ -26142,6 +26099,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26155,5 +26116,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26175,4 +26135,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "rodzaj" @@ -26196,6 +26158,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26208,5 +26174,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26228,4 +26193,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "boisko" @@ -26248,4 +26215,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "centrum sportowe" @@ -26268,4 +26237,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "stadion" @@ -26288,4 +26259,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "ścieżka" @@ -26487,158 +26460,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "football" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "australijski football" #. item "Sport (Ball)/Australian Football" +#: build/trans_presets.java:2071 +msgid "Edit Australian Football" +msgstr "" + +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "australijski football" + +#. item "Sport (Ball)/American Football" #: build/trans_presets.java:2077 -msgid "Edit Australian Football" -msgstr "" +#, fuzzy +msgid "Edit American Football" +msgstr "australijski football" #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "australijski football" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "australijski football" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "australijski football" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "australijski football" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Edycja miejsca do gry w rugby" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Edycja miejsca do gry w rugby" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "koszykówka" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "pole golfowe" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "bule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Edycja boiska do gry w boule" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "gra w kule" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "krykiet" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Edycja boiska do gry w krykieta" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "krykiet - siatki" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Edycja siatek do treningu gry w krykieta" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "krokiet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Edycja miejsca do gry w krokieta" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "hokej" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Edycja miejsca do gry w hokeja" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Edycja miejsca do gry w pelotę" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Edycja miejsca do gry w rugby" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "tenis stołowy" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Edycja miejsca do gry w tenis stołowy" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "tenis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Edycja miejsca do gry w tenisa" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Budowle" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "budynek" @@ -26646,5 +26655,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "budynek użyteczności publicznej" @@ -26652,10 +26661,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Edycja budynku użyteczności publicznej" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "ratusz" @@ -26663,10 +26672,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Edycja ratusza" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "ambasada" @@ -26674,10 +26683,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Edycja ambasady" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "sąd" @@ -26686,10 +26695,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Edycja siedziby sądu" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "więzienie" @@ -26698,10 +26707,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Edycja więzienia" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "posterunek policji" @@ -26711,10 +26720,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Edycja posterunku policji" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "straż pożarna" @@ -26723,10 +26732,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Edycja straży pożarnej" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "poczta" @@ -26734,5 +26743,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Edycja urzędu pocztowego" @@ -26740,15 +26749,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "przedszkole" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Edycja przedszkola" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "szkoła" @@ -26756,10 +26765,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Edycja szkoły" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "uniwersytet" @@ -26767,10 +26776,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Edycja uniwersytetu" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "college" @@ -26778,5 +26787,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Edycja college'u" @@ -26784,5 +26793,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "kino" @@ -26791,10 +26800,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Edycja kina" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "biblioteka" @@ -26803,9 +26812,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Edycja biblioteki" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "centrum kulturalne" @@ -26813,10 +26822,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Edycja centrum kulturalnego" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "teatr" @@ -26825,10 +26834,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Edycja teatru" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "miejsce kultu religijnego" @@ -26838,5 +26847,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Edycja miejsca kultu religijnego" @@ -26845,6 +26854,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Religia" @@ -26853,66 +26862,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "bahaizm" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "buddyzm" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "chrześcijaństwo" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hinduizm" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "dżinizm" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "judaizm" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "islam" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sikhizm" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "spirytualizm" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoizm" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zaratusztrianizm" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Wyznanie" @@ -26921,81 +26930,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "kościół anglikański" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptyści" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "kościół katolicki" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "ewangelikalizm" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "świadkowie Jehowy" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "luteranie" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "metodyści" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormoni" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "kościół prawosławny" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "zielonoświątkowcy" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "prezbiterianie" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestanci" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "kwakrzy" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "szyici" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "sunnici" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Adresy" @@ -27004,5 +27013,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Edycja informacji o adresach" @@ -27010,5 +27019,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Numer domu" @@ -27016,25 +27025,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Nazwa domu" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Nazwa ulicy" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Nazwa miejscowości" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Kod pocztowy" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Kod kraju" @@ -27043,5 +27052,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Edycja interpolacji adresów" @@ -27049,61 +27058,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Sposób numeracji domów" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "nieparzyste" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "parzyste" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "alfabetycznie" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Obiekty sztuczne" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "zakład produkcyjny" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Edycja zakładu produkcyjnego" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "wieża" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Edycja wieży" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "" @@ -27111,25 +27120,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "wieża ciśnień" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Edycja wieży ciśnień" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "zbiornik gazu" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Edycja zbiornika gazu" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "latarnia morska" @@ -27137,10 +27146,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Edycja latarni morskiej" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "wiatrak" @@ -27148,10 +27157,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Edycja wiatraka" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "rurociąg" @@ -27160,41 +27169,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Edycja rurociągu" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "gazowy" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "ciepłowniczy" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "naftowy" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "ściekowy" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "różne substancje" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Położenie" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "podwodny" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "nadziemy" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "oczyszczalnia ścieków" @@ -27204,10 +27213,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Edycja oczyszczalni ścieków" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "dźwig" @@ -27215,5 +27224,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Edycja dźwigu" @@ -27221,10 +27230,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Edycja radiolatarni" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "punkt geodezyjny" @@ -27232,10 +27241,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Edycja punktu geodezyjnego" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "monitoring" @@ -27243,23 +27252,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Edycja kamery do monitoringu" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "wewnętrzny" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "zewnętrzny" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "publiczny" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "elektrownia" @@ -27269,35 +27278,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Edycja elektowni" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "wiatrowa" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "wodna" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "cieplna" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "jądrowa" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "węglowa" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "fotowoltaiczna" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "rozdzielnia elektryczna" @@ -27306,10 +27315,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Edycja rozdzielni elektrycznej" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "stacja transformatorowa" @@ -27318,5 +27327,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Edycja stacji transformatorowej" @@ -27324,10 +27333,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Oznaczenie linii" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "słup elektryczny" @@ -27338,23 +27347,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Edycja słupa elektrycznego" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "wieża" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "słup" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "Numer referencyjny" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "linia wysokiego napięcia" @@ -27363,74 +27372,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Edycja linii wysokiego napięcia" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Rodzaj linii" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "linia główna" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "linia boczna" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Liczba kabli" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Liczba przewodów w jednym kablu" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "pojedynczy" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "podwójny" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "potrójny" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "poczwórny" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Udogodnienia" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "toalety" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "limitowane" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Uwagi" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "skrzynka pocztowa" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "telefon" @@ -27439,5 +27448,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Edycja telefonu" @@ -27445,5 +27454,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "na monety" @@ -27451,5 +27460,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "na banknoty" @@ -27457,5 +27466,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "na karty chipowe" @@ -27463,5 +27472,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "na karty debetowe" @@ -27469,15 +27478,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "na karty kredytowe" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "na karty telefoniczne" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "zbiórka odpadów" @@ -27486,5 +27495,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Edycja punktu zbiórki odpadów" @@ -27492,35 +27501,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "baterie" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "puszki" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "odzież" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "szkło" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "złom" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "kosz na śmieci" @@ -27528,5 +27537,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Edycja kosza na śmieci" @@ -27535,31 +27544,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "Oparcie" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Materiał" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "kamień" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "plastik" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Kolor" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "czarny" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "brązowy" @@ -27638,5 +27647,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27646,31 +27655,31 @@ msgstr "zielony" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "czerwony" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "niebieski" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "szary" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "biały" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Pojemność" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Ambona myśliwska" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Edycja ambony strzelniczej" @@ -27679,30 +27688,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Wysokość" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "niska" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "połowiczna" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "pełna" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Ukryj" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Zablokuj" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "fontanna" @@ -27711,10 +27720,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Edycja fontanny" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "woda do picia" @@ -27723,10 +27732,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Edycja punktu z wodą pitną" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "hydrant" @@ -27735,5 +27744,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Edycja hydrantu" @@ -27741,5 +27750,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "okno życia" @@ -27747,15 +27756,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Edycja okna życia" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Sklepy" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "dealer samochodowy" @@ -27763,10 +27772,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Edycja warsztatu samochodowego" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "sklep rowerowy" @@ -27775,28 +27784,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Edycja warsztatu rowerowego" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Edycja supermarketu" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "drogeria" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Edycja drogerii" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "sklep osiedlowy" @@ -27804,9 +27813,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Edycja sklepu osiedlowego" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "kiosk" @@ -27814,27 +27823,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Edycja kiosku" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "księgarnia" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Edycja księgarni" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "biuro podróży" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Edycja biura podróży" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "rzeźnik" @@ -27842,9 +27851,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Edycja sklepu mięsnego" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "piekarnia" @@ -27852,9 +27861,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Edycja piekarni" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "kwiaciarnia" @@ -27862,18 +27871,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Edycja kwiaciarni" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "naturalna żywność" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Edycja sklepu z naturalną żywnością" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "sklep monopolowy" @@ -27881,54 +27890,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Edycja sklepu monopolowego" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "sklep z napojami" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Edycja sklepu z napojami" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "sklep komputerowy" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Edycja sklepu komputerowego" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "sklep elektroniczny" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Edycja sklepu elektronicznego" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "sprzęt hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Edycja sklepu ze sprzętem hi-fi" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "meble" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Edycja sklepu meblowego" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "centrum ogrodnicze" @@ -27936,9 +27945,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Edycja centrum ogrodniczego" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "sklep z narzędziami" @@ -27946,9 +27955,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Edycja sklepu z narzędziami" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "sklep DIY" @@ -27956,54 +27965,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Edycja sklepu DIY (zrób to sam)" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "artykuły biurowe" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Edycja sklepu z artykułami biurowymi" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "fryzjer" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Edycja salonu fryzjerskiego" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "obuwniczy" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Edycja sklepu obuwniczego" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "zabawki" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Edycja sklepu z zabawkami" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "wypożyczalnia wideo" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Edycja wypożyczalni wideo" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "pralnia chemiczna" @@ -28011,9 +28020,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Edycja palni chemicznej" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "pralnia samoobsługowa" @@ -28021,9 +28030,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "wyspa" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "sklep turystyczny" @@ -28031,24 +28040,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Edycja sklepu ze sprzętem turystycznym" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Edycja sklepu sportowego" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "optyk" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Edycja optyka" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "automat sprzedający" @@ -28056,5 +28065,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Edycja automatu sprzedającego" @@ -28062,97 +28071,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Sprzedawane produkty" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "bilety komunikacji miejskiej" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "mapy komunikacji miejskiej" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "bilety parkingowe" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "jedzenie" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "napoje" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "słodycze" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "papierosy" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "zdjęcia" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "jedzenie dla zwierząt" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "gazety" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "zabawki" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "znaczki" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "karty SIM" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "vouchery" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "prezerwatywy" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tampony" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "torby na odchody" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Gotówka" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "bank" @@ -28160,14 +28169,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Edycja banku" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "kantor" @@ -28175,5 +28184,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Edycja kantoru" @@ -28181,15 +28190,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Edycja bankomatu" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Zdrowie" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "lekarz" @@ -28197,18 +28206,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Edycja lekarza" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "dentysta" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Edycja dentysty" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "apteka" @@ -28216,5 +28225,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Edycja apteki" @@ -28222,9 +28231,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "realizacja recept" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "szpital" @@ -28232,10 +28241,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Edycja szpitala" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "" @@ -28244,5 +28253,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "" @@ -28251,20 +28260,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Numer punktu" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Numer telefonu" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Podaj razem z kodem kraju, np.: +12-345-67890)" @@ -28272,5 +28281,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "weterynarz" @@ -28279,64 +28288,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Edycja lecznicy weterynaryjnej" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Geografia" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Miejsca" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "kontynent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Edycja kontynentu" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "kraj" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Edycja kraju" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "stan" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Edycja stanu" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Edycja regionu" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "okręg" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Edycja okręgu / hrabstwa" @@ -28344,15 +28353,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "miasto" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Edycja miasta" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "małe miasto" @@ -28360,10 +28369,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Edycja miejscowości" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "dzielnica" @@ -28371,25 +28380,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Edycja dzielnicy" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "wieś" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Edycja wsi" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "przysiółek" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Edycja wólki" @@ -28397,5 +28406,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "okolica" @@ -28403,10 +28412,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Edycja okolicy" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "wyspa" @@ -28414,10 +28423,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Edycja wyspy" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "wysepka" @@ -28425,5 +28434,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Edycja wysepki" @@ -28431,5 +28440,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "wejście do jaskini" @@ -28437,10 +28446,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Edycja wejścia do jaskini" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "wzgórze" @@ -28448,10 +28457,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Edycja wzgórza" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "lodowiec" @@ -28459,10 +28468,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Edycja lodowca" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "wulkan" @@ -28470,70 +28479,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Edycja wulkanu" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Granice" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "narodowa" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Edycja granicy narodowej" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "administracyjna" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Edycja granicy administracyjnej" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "cywilna" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Edycja granicy cywilnej" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "polityczna" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Edycja granicy politycznej" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "park narodowy" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Edycja granicy parku narodowego" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Zagospodarowanie terenu" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "drzewo" @@ -28542,15 +28551,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Edycja drzewa" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Nazwa systematyczna" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "las pierwotny" @@ -28559,5 +28568,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Edycja lasu pierwotnego" @@ -28565,17 +28574,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "iglasty" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "liściasty" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "mieszany" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "las" @@ -28584,14 +28593,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Edycja lasu" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "rezerwat przyrody" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Edycja rezerwatu przyrody" @@ -28599,25 +28608,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "rumowisko" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Edycja rumowiska" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "busz" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Edycja buszu" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "hala górska" @@ -28625,10 +28634,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Edycji hali górskiej" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "wrzosowisko" @@ -28636,5 +28645,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Edycja wrzosowiska" @@ -28642,5 +28651,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "zagroda" @@ -28649,45 +28658,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Edycja zagrody" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "grunty rolne" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Edycja gruntów rolnych" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "łąka" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Edycja łąki" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "winnica" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Edycja winnicy" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "ogródki działkowe" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Edycja ogródków działkowych" @@ -28695,25 +28704,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "ogród" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Edycja ogrodu" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "trawa" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "zieleń miejska" @@ -28721,10 +28730,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Edycja zieleni miejskiej" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "miejsce publiczne" @@ -28732,20 +28741,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Edycja miejsca publicznego" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "park" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Edycja parku" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "teren rekreacyjny" @@ -28753,5 +28762,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Edycja terenu rekreacyjnego" @@ -28759,15 +28768,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "zabudowa mieszkaniowa" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Edycja zabudowy mieszkaniowej" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "cmentarz" @@ -28775,9 +28784,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Edycja cmentarza" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "cmentarz" @@ -28785,39 +28794,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Edycja cmentarza" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "handel" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Edycja obszaru handlowego" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "biura i usługi" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Edycja obszaru biur i usług" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "teren przemysłowy" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Edycja terenu przemysłowego" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "teren kolejowy" @@ -28825,15 +28834,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Edycja terenu kolejowego" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "obszar wojskowy" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Edycja obszaru wojskowego" @@ -28841,50 +28850,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "budowa" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Edycja terenu budowy" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "teren poprzemysłowy" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Edycja terenu poprzemysłowego" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "teren pod zabudowę" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Edycja terenu pod zabudowę" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "wysypisko" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Edycja wysypiska śmieci" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "kamieniołom" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Edycja komieniołomu" @@ -28894,5 +28903,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Edycja multipolygonu" @@ -28904,5 +28913,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "Zewnętrzny segment" @@ -28910,5 +28919,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "Wewnętrzny segment" @@ -28916,5 +28925,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "granica" @@ -28925,5 +28934,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "Edycja granicy" @@ -28931,36 +28940,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "Rodzaj granicy" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "administracyjna" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "narodowa" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "cywilna" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "polityczna" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "Poziom administracyjny" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "Podobszary" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "Centrum administracyjne" @@ -28968,5 +28977,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "ograniczenia skrętu" @@ -28975,5 +28984,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Edycja ograniczenia skrętu" @@ -28981,34 +28990,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Ograniczenie" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "zakaz skrętu w lewo" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "zakaz skrętu w prawo" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "zakaz jazdy prosto" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "zakaz zawracania" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "nakaz skrętu w prawo" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "nakaz skrętu w lewo" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "nakaz jazdy prosto" @@ -29017,15 +29026,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "z drogi" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "przez węzeł lub drogę" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "do drogi" @@ -29033,5 +29042,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "trasa" @@ -29040,5 +29049,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Edytuj trasę" @@ -29046,5 +29055,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Typ trasy" @@ -29152,5 +29161,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29161,17 +29170,17 @@ msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "droga" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "prom" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "" @@ -29239,5 +29248,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29247,9 +29256,9 @@ msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "tramway" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "objazd" @@ -29263,10 +29272,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Opis symboli" @@ -29274,31 +29283,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Sieć" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "proponowany" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "alternatywny" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "tymczasowy" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "połaczenie" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Kolor (hex)" @@ -29307,30 +29316,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "" @@ -29557,5 +29566,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "przestarzały" @@ -32883,11 +32892,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "Miejsce" @@ -32901,5 +32910,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" @@ -33255,4 +33264,35 @@ msgstr "Sycylia - Włochy" +#~ msgid "Visible State:" +#~ msgstr "Widoczne:" + +#~ msgid "visible (on the server)" +#~ msgstr "widoczne (na serwerze)" + +#~ msgid "not visible (on the server)" +#~ msgstr "nie widoczne (na serwerze)" + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "{0} konflikt pozostaje do rozwiązania.

Proszę otworzyć okno " +#~ "Konfliktów aby rozwiązać go ręcznie." +#~ msgstr[1] "" +#~ "{0} konflikty pozostaje do rozwiązania.

Proszę otworzyć okno " +#~ "Konfliktów aby rozwiązać je ręcznie." +#~ msgstr[2] "" +#~ "{0} konfliktów pozostaje do rozwiązania.

Proszę otworzyć okno " +#~ "Konfliktów aby rozwiązać je ręcznie." + +#~ msgid "football" +#~ msgstr "futbol amerykański" + +#~ msgid "Football" +#~ msgstr "football" + #~ msgid "Move" #~ msgstr "Przenieś" Index: /applications/editors/josm/i18n/po/pt_BR.po =================================================================== --- /applications/editors/josm/i18n/po/pt_BR.po (revision 22208) +++ /applications/editors/josm/i18n/po/pt_BR.po (revision 22209) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-24 10:54+0000\n" -"Last-Translator: Bráulio Bezerra \n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-07-05 20:16+0000\n" +"Last-Translator: Rodrigo de Avila \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:52+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:09+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -247,5 +247,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -253,6 +253,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -340,8 +340,7 @@ msgstr "Sem camadas destino" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Adicionar Nó..." @@ -665,5 +664,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1049,5 +1048,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1056,5 +1055,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1193,4 +1192,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Move Nó..." @@ -1491,6 +1491,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1712,6 +1712,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2361,5 +2359,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2607,10 +2605,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Pesquisar..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Busca por objetos." @@ -2618,65 +2616,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Por favor digite um texto-filtro." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Por favor, entre com uma string de busca." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Digite a expressão de pesquisa" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "susbtitui a seleção" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "adiciona à seleção" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "remove da seleção" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "encontre na seleção" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "sensível à caixa alta" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "Todos os Objetos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "expressão regular" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "Rua Augusta - \"Rua\" e \"Augusta\" em qualquer chave ou valor." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "\"Rua Augusta\" - ''Rua Augusta'' em qualquer chave ou nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Aug - \"Aug\" em qualquer parte do nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - chave ''type'' com valor exato ''route''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2686,21 +2684,21 @@ "b>, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - ''Bak'' não existe no nome." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "mão única? - oneway=yes, true, 1 ou on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - qualquer valor presente na chave=foot" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Destinos especiais:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2709,18 +2707,18 @@ "relation - relação)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - todos os objetos modificados por determinado usuário" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" "user:anonymous - todos objetos modificados por usuários anônimos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - objeto com pedido ID (0 para novos objetos)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2730,5 +2728,5 @@ "atribuída)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2738,5 +2736,5 @@ "(0 objetos sem conjunto de modificações assignados)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2746,5 +2744,5 @@ "nós:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2754,9 +2752,9 @@ "ou tags:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "role:... - objeto com um certo papel em uma relação" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2766,21 +2764,21 @@ "(2009-11-12T14:51:09Z, 2009-11-12 ou T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - todos os objetos modificados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - todos os objetos selecionados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - todos os objetos incompletos" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - todos objetos não tagueados" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2788,5 +2786,5 @@ "child expr - todos objetos filhos que coincidem com a expressão" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2795,14 +2793,14 @@ "expressão" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "Use | ou OR para combinar com \"ou\" lógico" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" "Usar \" para comentar operadores (ex. se uma chave contem :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2812,12 +2810,12 @@ "precedidos por \\ (ex: \\\" e \\\\)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Usar ( e ) para agrupar expressões" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2826,38 +2824,51 @@ msgstr "Filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Buscar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Aplicar o filtro" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Iniciar Pesquisa" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Digite uma expressão de busca" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Não há valores coincidentes para ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nada adicionado à seleção pela busca por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nada foi removido da seleção quando buscado por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Nada encontrado na seleção ao pesquisar por \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2865,5 +2876,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2871,5 +2882,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2877,5 +2888,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2883,5 +2894,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -3021,8 +3032,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3165,5 +3176,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3293,11 +3304,11 @@ msgstr[1] "Mover {0} nós" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Eliminado objeto ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3306,5 +3317,5 @@ msgstr[1] "{0} objetos eliminados" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3315,5 +3326,5 @@ "2. Atualmente é {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3351,5 +3362,5 @@ msgstr "Resolver {0} conflitos do rotulo na relação {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3692,6 +3703,6 @@ "trabalho." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3701,10 +3712,10 @@ msgstr "Faltando alvo de mescla para caminho com id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Faltando alvo de mescla para objeto com id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3712,5 +3723,5 @@ msgstr "Faltando alvo de mescla para nó com id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3719,5 +3730,5 @@ msgstr "Faltando alvo de mescla para relação com id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3726,78 +3737,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "Faltando alvo de mescla para tipo {0} com id {1}" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "E" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "H" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Texto" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "R" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "A" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "D" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "F" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

Filtro ativo

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} objetos escondidos" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "{0} objetos desabilitados" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "

Feche a janela de filtros para ver todos objetos.

" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3938,5 +3875,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "segundo plano" @@ -4064,12 +4001,10 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (France)" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "Sistema geodésico UTM20 Norte" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4111,5 +4046,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "ferrovia" @@ -4130,7 +4065,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4197,7 +4132,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "prédio" @@ -4286,5 +4221,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4516,5 +4451,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4829,12 +4764,12 @@ msgstr "regra {0} não participa no par de comparação {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Propriedades" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4845,6 +4780,6 @@ msgstr "Etiquetas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4852,6 +4787,6 @@ msgstr "Nós" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4859,9 +4794,9 @@ msgstr "Membros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Nenhum conflito de tags pendentes a ser resolvido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4870,5 +4805,5 @@ msgstr[1] "Tags ({0} conflitos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4877,9 +4812,9 @@ msgstr[1] "{0} conflitos de tags pendentes de resolução" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Nós (resolvido)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4888,17 +4823,17 @@ "lista de nós deste caminho." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Nós (com conflitos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Conflitos pendentes na lista de nós deste caminho" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Membros(resolvido)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4908,25 +4843,25 @@ "na lista de membros desta relação" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Membros(com conflitos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Conflitos pendentes na lista de membros desta relação" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Nenhum conflito de propriedades pendente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Propriedades(com conflitos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Conflito de propriedades pendente de solução" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Resolução de Conflito" @@ -4974,5 +4909,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Minha versão" @@ -4983,5 +4918,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4997,5 +4932,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Sua versão" @@ -5079,5 +5014,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -5089,5 +5024,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Abaixo" @@ -5194,72 +5129,9 @@ "resolução" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" -"Um erro ocorreu durante a comunicação com o servidor.
Detalhes: {0}" -"" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "A comunicação com o servidor falhou" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Sim, repô-los também" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "Não, cancelar operação" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -"Existe {0} nó adicional usado pelo caminho {1}
que está apagado no " -"servidor.

Você quer recuperar este nó também?" -msgstr[1] "" -"Existem {0} nós adicionais usados pelo caminho {1}
que estão apagados no " -"servidor.

Você quer recuperar estes nós também?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Desfazer a remoção dos nós adicionais?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -"Existe {0} primitivo adicional referenciado pela relação {1}
que foi " -"removido no servidor.

Você quer desfazer a remoção deste primitivo " -"também?" -msgstr[1] "" -"Existem {0} primitivos adicionais referenciados pela relação {1}
que " -"foram removidos no servidor.

Você quer desfazer a remoção destes " -"primitivos também?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Recuperar primitivas dependentes?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Propriedades de meus dados, ou seja, os dados locais" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5269,129 +5141,59 @@ "meus elementos quando decisões de combinação forem aplicadas." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Propriedades nos dados dele(s), ou seja, o servidor de dados" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Coordenadas:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Estado excluído:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Estado Visível:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "Referenciado por:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(nenhum)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "removido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "não apagado" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "visível (no servidor)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "não visível (no servidor)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Mantenha uma cópia da versão local" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Eliminar fisicamente os dados locais" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Manter minhas coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Mantenha suas coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "Não decidir conflito entre diferentes coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "Manter meu estado de apagado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "Manter seu estado suprimido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "Não decidir conflito entre diferentes estados de exclusão" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "Manter meu estado visível" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Sim, resetar id" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" -"Para manter sua versão local, o JOSM
tem que resetar o ID da " -"primitiva {0} para zero.
Na próximo envio, o servidor vai atribuir
um " -"novo ID.
Você concorda?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "Resetar id para 0" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Manter seu estado visível" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Sim, limpe-o" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -" JOSM terá de remover sua primitiva local com id {0}
dos dados. " -"
Concorda? " - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Remover do conjuto de dados" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "Não decidir conflito entre diferentes estados de visibilidade" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5540,5 +5342,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "todos os números" @@ -5619,7 +5421,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5629,6 +5431,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5842,5 +5644,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5900,25 +5702,25 @@ "acima." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Cancelar a resolução de conflitos e fechar a janela" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Aplicar a resolução de conflitos e fechar a janela" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Aplicar a resolução" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Fechar assim mesmo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Continuar resolvendo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5936,22 +5738,22 @@ "conflitos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "Conflito não resolvido completamente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Resolver conflitos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Resolver conflitos para \"{0}\"" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Filtrar objetos e esconder/desativá-los" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5964,44 +5766,123 @@ msgstr "Adicionar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "Adicionar filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Editar filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Apagar filtro." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Mover filtro para cima." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Mover filtro para baixo." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Habilitar filtro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Esconder elementos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Inverter filtro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Modo Filtro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "Filtro Escondido: {0} Desabilitado: {1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Erro ao carregar arquivo" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "E" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "H" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Texto" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "R" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "A" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "D" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

Filtro ativo

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} objetos escondidos" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "{0} objetos desabilitados" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "

Feche a janela de filtros para ver todos objetos.

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -6043,37 +5924,37 @@ msgstr "Informação avançada de objeto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Digite as coordenadas do novo nó." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Usar casas decimais." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valores negativos são para coordenadas dos hemisférios Sul/Oeste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Por favor digite uma latitude válida entre -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Por favor digite uma latitude entre -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Por favor digite uma longitude válida entre -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Por favor digite uma longitude entre -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Feche a janela de diálogo e crie um novo nó" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Feche a janela de diálogo, não crie um novo nó" @@ -6133,5 +6014,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relações" @@ -6179,10 +6060,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "Baixar membros incompletos das relações selecionadas" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "Baixar membros incompletos" @@ -6246,14 +6127,14 @@ msgstr "Sel.: Rel.:{0} / Caminhos:{1} / Nós:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Seleção: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "Obter informação detalhada do estado interno dos objetos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "Inspecionar" @@ -6971,8 +6852,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6997,6 +6886,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7379,69 +7266,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Nome" @@ -8081,5 +7969,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8760,8 +8648,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Tipo" @@ -8790,6 +8678,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "Desconhecido" @@ -9139,5 +9027,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Conflitos detectados" @@ -9689,4 +9577,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -10225,5 +10114,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Descrição" @@ -10274,5 +10163,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10347,23 +10236,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Camada de dados {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "fora da área baixada" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "versão {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 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" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10372,38 +10261,11 @@ msgstr[1] "Houve {0} conflitos detectados." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"{0} conflito ainda não foi resolvido.

Por favor, abra a janela de " -"Lista de Conflitos e resolva-o manualmente." -msgstr[1] "" -"{0} conflitos ainda não foram resolvidos.

Por favor, abra a janela de " -"Lista de Conflitos e resolva-os manualmente." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "Clique para fechar essa janela e continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10412,32 +10274,32 @@ msgstr[1] "{0} removidos" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} consiste em:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "remover definição" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "Versão API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Converter para camada GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "Teste de consistência de dados" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "Nenhum problema encontrado" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "Foi encontrado os seguintes problemas:" @@ -13459,4 +13321,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14929,5 +14792,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15087,9 +14950,10 @@ #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59 msgid "Private (only shared as anonymous, unordered points)" -msgstr "" +msgstr "Privado (compartilhado apenas como anônimo, com pontos desordenados)" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:60 msgid "Public (shown in trace list and as anonymous, unordered points)" msgstr "" +"Público (aparece na lista de trilhas como anônimo, de pontos desordenados)" #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:61 @@ -15150,5 +15014,5 @@ #, java-format msgid "Selected track: {0}" -msgstr "" +msgstr "Trilha selecionada: {0}" #. Set progress dialog to indeterminate while connecting @@ -15208,5 +15072,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Interpolação de Endereços" @@ -15640,36 +15504,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Multipolígono" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "endereço" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Criar uma nova relação" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Construções" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Número" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Próximo" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Rua" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Endereços" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15825,10 +15690,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15883,7 +15752,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15892,13 +15761,13 @@ msgstr "água" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "símbolo" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "encomenda" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "número da encomenda" @@ -15946,32 +15815,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "endereço" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15983,18 +15852,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "WMS do cadastre Francese" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Fonte" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16002,5 +15871,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16008,9 +15877,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Permitir empilhamento de camadas múltiplas" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" @@ -16018,122 +15887,126 @@ "esquerda é mais transparente." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "Resolução da imagem:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "Resolução alta (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "Resolução média (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "Resolução baixa (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "Bilinear (rápido)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "Bicúbica (lenta)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "Camadas:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "Encomendas." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -16436,5 +16309,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -16443,14 +16316,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "" @@ -17708,4 +17581,24 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "Ocorreu a IOException \"{0}\"" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +#, fuzzy +msgid "GTFS-Stops" +msgstr "Paradas" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17747,9 +17640,4 @@ msgid "Create Stops from a GPX file" msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" -msgstr "Ocorreu a IOException \"{0}\"" #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83 @@ -19288,5 +19176,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Outro" @@ -19476,5 +19364,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Multipolígono" @@ -19993,5 +19881,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "" @@ -20034,34 +19922,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Não há dados" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -20084,7 +19975,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Vias sem tags" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20385,5 +20275,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112 msgid "Supported Rectifier Services:" -msgstr "" +msgstr "Serviços de Retificação Suportados:" #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136 @@ -20998,7 +20888,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Por favor, selecione um arquivo" +msgstr "" #. Strings in JFileChooser @@ -21284,7 +21173,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21293,10 +21189,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Possibilita capacidade de roteamento." #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21305,5 +21201,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21312,15 +21208,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21330,10 +21226,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21342,5 +21238,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21349,5 +21245,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21356,10 +21252,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21368,5 +21264,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21376,5 +21272,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21383,15 +21279,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21400,5 +21296,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21533,5 +21429,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Referência" @@ -22070,5 +21966,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "" @@ -22081,5 +21977,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "madeira" @@ -22384,8 +22280,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "sim" @@ -22496,8 +22392,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "não" @@ -22803,5 +22699,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "serviço" @@ -22921,5 +22817,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "caminhada" @@ -23068,4 +22964,9 @@ msgid "Edit Motorway Junction" msgstr "Editar Trevo de Acesso" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Número" #. item "Waypoints/Motorway Junction" text "Number" @@ -23118,13 +23019,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operador" @@ -23392,6 +23293,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Altitude" @@ -24243,5 +24144,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Voltagem" @@ -24612,24 +24513,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Horário de Funcionamento" @@ -24696,23 +24597,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24/7" @@ -24726,23 +24627,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "Seg-Sex 08:30-20:00" @@ -24756,23 +24657,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 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" @@ -24886,6 +24787,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Número de Referência" @@ -24901,5 +24802,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "" @@ -24913,5 +24814,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Taxa" @@ -25087,5 +24988,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Cadeira de Rodas" @@ -25123,5 +25024,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Abrigo" @@ -25129,5 +25030,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Banco" @@ -25246,5 +25147,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "" @@ -25983,5 +25884,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Esportes" @@ -26056,5 +25957,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -26168,12 +26117,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26240,12 +26181,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26259,12 +26192,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -26426,5 +26351,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "esporte" @@ -26451,4 +26377,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "futebol australiano" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "futebol australiano" @@ -26476,4 +26408,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "futebol australiano" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "canoagem" @@ -26516,6 +26454,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "futebol americano" +#, fuzzy +msgid "gaelic_football" +msgstr "futebol australiano" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26556,5 +26495,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +msgid "rugby_union" msgstr "" @@ -26675,6 +26619,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26688,5 +26636,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26708,4 +26655,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "tipo" @@ -26729,6 +26678,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26741,5 +26694,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26761,4 +26713,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "" @@ -26781,4 +26735,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "" @@ -26801,4 +26757,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "estádio" @@ -26821,4 +26779,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -27020,158 +26980,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Editar Futebol Americano" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Futebol Australiano" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Editar Futebol Australiano" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Futebol Australiano" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Editar Futebol Australiano" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Editar Futebol Americano" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Editar Futebol Australiano" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Editar Futebol Americano" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Editar Futebol Americano" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Editar Rugby" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Editar Rugby" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Editar Campo de Baseball" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Basquetebol" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Editar Basquetebol" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Editar Golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Críquete" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Editar Críquete" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Editar Hockey" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Editar Rugby" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Tênis de mesa" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Editar Tênis de Mesa" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tenis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Editar Tênis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Construção humana" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Edificação" @@ -27179,5 +27175,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Prédio Público" @@ -27185,10 +27181,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Editar Prédio Público" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Prefeitura" @@ -27196,10 +27192,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Editar Prefeitura" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Embaixada" @@ -27207,10 +27203,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Editar Embaixada" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Fórum" @@ -27219,10 +27215,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Editar Fórum" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Presídio" @@ -27231,10 +27227,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Editar Presídio" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Polícia" @@ -27244,10 +27240,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Editar Polícia" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Bombeiros" @@ -27256,10 +27252,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Editar Bombeiros" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Correios" @@ -27267,5 +27263,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Editar Correios" @@ -27273,15 +27269,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Creche" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Editar Creche" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Escola" @@ -27289,10 +27285,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Editar Escola" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Universidade" @@ -27300,10 +27296,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Editar Universidade" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Faculdade" @@ -27311,5 +27307,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Editar Faculdade" @@ -27317,5 +27313,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Cinema" @@ -27324,10 +27320,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Editar Cinema" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Biblioteca" @@ -27336,9 +27332,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Editar Biblioteca" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Centro de Artes" @@ -27346,10 +27342,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Editar Centro de Artes" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Teatro" @@ -27358,10 +27354,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Editar Teatro" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Lugar de Adoração" @@ -27371,5 +27367,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Editar Lugar de Adoração" @@ -27378,6 +27374,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Religião" @@ -27386,66 +27382,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "budismo" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "cristianismo" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hinduísmo" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "jainismo" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "judaísmo" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "muçulmano" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sikhismo" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "espiritismo" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoísmo" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "unitarianismo" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zoroastrianismo" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Denominação" @@ -27454,81 +27450,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglicana" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "batista" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "católica" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "evangélica" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "testemunha de jeová" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "luterana" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "metodista" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mórmon" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "ortodoxa" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "presbiteriana" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestante" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "xiismo" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "sunismo" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Endereços" @@ -27537,5 +27533,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Editar Informações de Endereço" @@ -27543,5 +27539,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Número da casa" @@ -27549,25 +27545,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Nome da casa" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Nome do rua" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Cidade" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "CEP" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Código do país" @@ -27576,5 +27572,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Editar Interpolação de Endereços" @@ -27582,61 +27578,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Esquema de numeração" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "números ímpares" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "números pares" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "alfabético" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Construção humana" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Fábrica" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Editar Fábrica" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Torre" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Editar Torre" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "comunicação" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "observação" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Altura (metros)" @@ -27644,25 +27640,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Torre de Água" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Editar Torre de Água" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Gasômetro" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Editar Gasômetro" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Farol" @@ -27670,10 +27666,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Editar Farol" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Moinho de Vento" @@ -27681,10 +27677,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Editar Moinho de Vento" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Cano" @@ -27693,41 +27689,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Editar Cano" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "gás" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "calor" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "petróleo" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "qualquer substância" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Localidade" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "subaquático" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Estação de Tratamento de Esgoto" @@ -27737,10 +27733,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Editar Estação de Tratamento de Esgoto" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Guindaste" @@ -27748,5 +27744,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Editar Guindaste" @@ -27754,10 +27750,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Vértice Geodésico" @@ -27765,10 +27761,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Editar Vértice Geodésico" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Câmera de Vigilância" @@ -27776,23 +27772,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Editar Câmera de Vigilância" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "público" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Gerador de Energia" @@ -27802,35 +27798,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Editar Gerador de Energia" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "eólica" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "hidrelétrica" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fóssil" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "nuclear" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "carvão" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "carvão" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Estação de Energia" @@ -27839,10 +27835,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Editar Estação de Energia" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Subestação de Energia" @@ -27851,5 +27847,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Editar Subestação de Energia" @@ -27857,10 +27853,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Torre de Energia" @@ -27871,23 +27867,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Editar Torre de Energia" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "torre" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "polo" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Linha de transmissão" @@ -27896,74 +27892,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Editar Linha de Transmissão" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Tipo de Linha de Transmissão" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "linha de transmissão" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Quantidade de Cabos" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Número de cabos (ou condutores) por cabo-de-força" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "simples" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "duplo" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "triplo" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "quádruplo" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Comodidades" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Banheiros" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "limitado" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Nota" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Caixa de Correio" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telefone" @@ -27972,5 +27968,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Editar Telefone" @@ -27978,5 +27974,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Moedas" @@ -27984,5 +27980,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Notas" @@ -27990,5 +27986,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Carteiras Eletrónicas ou Cartões pré-pagos" @@ -27996,5 +27992,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Cartões de Débito" @@ -28002,15 +27998,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Cartão de Crédito" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Cartão Telefônico" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Reciclagem" @@ -28019,5 +28015,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Editar Centro de Reciclagem" @@ -28025,35 +28021,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Baterias" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Latas" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Roupas" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Vidro" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Papel" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Ferro Velho" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "Cesta de Lixo" @@ -28061,5 +28057,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Editar Cesta de Lixo" @@ -28068,31 +28064,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "rocha" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "plástico" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Cor" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "preto" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "marrom" @@ -28171,5 +28167,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -28179,31 +28175,31 @@ msgstr "verde" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "vermelho" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "azul" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "cinza" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "branco" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Número de Assentos" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "" @@ -28212,30 +28208,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Altura" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "baixa" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "metade" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "cheio" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Ocutar" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Bloquear" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Chafariz" @@ -28244,10 +28240,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Editar Chafariz" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Bebedouro" @@ -28256,10 +28252,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Editar Bebedouro" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Hidrante" @@ -28268,5 +28264,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Editar Hidrante" @@ -28274,5 +28270,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Berçário" @@ -28280,15 +28276,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Editar Berçário" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Lojas" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Concessionária" @@ -28296,10 +28292,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Editar Loja de Carros" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Casa de Bicicleta" @@ -28308,28 +28304,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Editar Loja de Bicicletas" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermercado" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Editar Supermercado" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Loja de Conveniência" @@ -28337,9 +28333,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Editar Loja de Conveniência" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Quiosque" @@ -28347,27 +28343,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Editar Quiosque" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Livraria" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Editar Livraria" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Agência de Viagem" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Editar Agência de Viagem" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Açougue" @@ -28375,9 +28371,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Editar Açougue" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Padaria" @@ -28385,9 +28381,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Editar Padaria" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Floricultura" @@ -28395,18 +28391,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Editar Floricultura" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Orgânicos" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Editar Loja de Orgânicos" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Álcool" @@ -28414,54 +28410,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Editar" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Bebidas" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Editar Loja de Bebidas" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Computador" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Editar Loja de Computador" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Eletrônicos" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Editar Loja de Eletrônicos" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Equipamentos de Áudio" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Editar Loja de Equipamentos de Áudio" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Móveis" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Editar Loja de Móveis" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Loja de Plantas" @@ -28469,9 +28465,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Editar Loja de Plantas" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Componente físico" @@ -28479,9 +28475,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Editar Loja de Utilidades Domésticas" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Loja de Ferragens" @@ -28489,54 +28485,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Editar Loja de Ferragens" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Papelaria" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Editar Papelaria" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Cabelereiro" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Editar Cabelereiro" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Sapatos" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Editar Loja de Sapatos" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Brinquedos" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Editar Loja de Brinquedos" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Locadora de Vídeo" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Editar Locadora de Vídeo" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Lavanderia à Seco" @@ -28544,9 +28540,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Editar Lavanderia à Seco" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Lavanderia" @@ -28554,9 +28550,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Editar Lavanderia" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Outdoor" @@ -28564,24 +28560,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Editar Loja de Esportes" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Óculos" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Editar Loja de Óculos" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "" @@ -28589,5 +28585,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Editar Máquina de Vendas" @@ -28595,97 +28591,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Produtos à venda" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "tíquetes de transporte público" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "mapas de transporte público" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "tíquetes de estacionamento" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "comida" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "bebidas" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "doces" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "cigarros" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "fotos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "ração animal" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "jornais" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "brinquedos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "selos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "Cartões SIM" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "vales" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "preservativos" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "absorventes" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "sacos para fezes" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "Cartões de fidelidade" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Dinheiro" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Banco" @@ -28693,14 +28689,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Editar Banco" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Caixa Eletrônico" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Loja de Câmbio" @@ -28708,5 +28704,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Editar Loja de Câmbio" @@ -28714,15 +28710,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Editar Caixa Eletrônico" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Saúde" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Médicos" @@ -28730,18 +28726,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Editar Médicos" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Dentistas" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Editar Dentistas" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Farmácia" @@ -28749,5 +28745,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Editar Farmácia" @@ -28755,9 +28751,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Hospital" @@ -28765,10 +28761,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Editar Hospital" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Entrada de Emergência" @@ -28777,5 +28773,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Editar Entrada de Emergência" @@ -28784,20 +28780,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Número do Ponto" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Número de telefone" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Use código internacional, como +12-345-67890)" @@ -28805,5 +28801,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Veterinária" @@ -28812,64 +28808,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Editar Veterinária" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Geografia" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Lugares" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Continente" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Editar Continente" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "País" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Editar País" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Estado" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Editar Estado" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Região" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Editar Região" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Condado" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Editar Condado" @@ -28877,15 +28873,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Cidade" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Editar Cidade (mais que 100 mil habitantes)" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Cidade (menos que 100 mil habitantes)" @@ -28893,10 +28889,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Editar Cidade (menos que 100 mil habitantes)" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Bairro" @@ -28904,25 +28900,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Editar Bairro" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Vilarejo" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Editar Vilarejo" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "" @@ -28930,5 +28926,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Localidade" @@ -28936,10 +28932,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Editar Localidade" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Ilha" @@ -28947,10 +28943,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Editar Ilha" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Ilhota" @@ -28958,5 +28954,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Editar Ilhota" @@ -28964,5 +28960,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Entrada de Caverna" @@ -28970,10 +28966,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Editar Entrada de Caverna" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Pico" @@ -28981,10 +28977,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Editar Pico" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Geleira" @@ -28992,10 +28988,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Editar Geleira" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Vulcão" @@ -29003,70 +28999,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Editar Vulcão" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Fronteiras" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Nacional" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Editar Fronteiras Nacionais" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Administrativo" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Editar Fronteiras Administrativas" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Civil" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Editar Fronteiras Civis" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Político" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Editar Fronteiras Políticas" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Parque nacional" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Editar Fronteira de Parque Nacional" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Uso da terra" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Árvore" @@ -29075,15 +29071,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Editar Árvore" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Nome Botânico" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Floresta" @@ -29092,5 +29088,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Editar Floresta" @@ -29098,17 +29094,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "conífera" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "decídua" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "misturado" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Floresta" @@ -29117,14 +29113,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Editar zona Florestal" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Reserva Natural" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Editar Reserva Natural" @@ -29132,25 +29128,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Arbusto" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Editar arbusto" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "" @@ -29158,10 +29154,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Editar rocha" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Matagal" @@ -29169,5 +29165,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Editar matagal" @@ -29175,5 +29171,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Fazenda" @@ -29182,45 +29178,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Terra agrícola" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Editar zona Agrícola" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Vinhedo" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Editar zona de Vinhedos" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Hortas comunitárias" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "" @@ -29228,25 +29224,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Jardim" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Editar Jardim" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Grama" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Editar zona de Gramado" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "" @@ -29254,10 +29250,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Comum" @@ -29265,20 +29261,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Parque" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Editar Parque" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "área de recreação" @@ -29286,5 +29282,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -29292,15 +29288,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Área residencial" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Editar zona Residencial" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Cemitério" @@ -29308,9 +29304,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Editar Cemitério" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Cemitério" @@ -29318,39 +29314,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Editar zona de Cemitério" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Comércio" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Editar zona Comercial" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Comercial" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Editar zona Comercial" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Industrial" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Editar zona Industrial" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "" @@ -29358,15 +29354,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Militar" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Editar zona Militar" @@ -29374,50 +29370,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Área de construção" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Editar zona para Construção" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Aterro" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Editar Aterro" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Pedreira" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "" @@ -29427,5 +29423,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Editar Multipolígono" @@ -29437,5 +29433,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "segmento externo" @@ -29443,5 +29439,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "segmento interno" @@ -29449,5 +29445,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -29458,5 +29454,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -29464,36 +29460,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -29501,5 +29497,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Restrição de manobra" @@ -29508,5 +29504,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Editar restrição de manobras" @@ -29514,34 +29510,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Restrição" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "proibida_conversão_esquerda" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "proibida_conversão_direita" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "proibido_em_frente" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "proibido_retornar" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "somente_a_direita" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "somente_a_esquerda" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "somente_em_frente" @@ -29550,15 +29546,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "do caminho" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "nó de via ou caminho" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "para caminho" @@ -29566,5 +29562,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Rota" @@ -29573,5 +29569,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Editar Rota" @@ -29579,5 +29575,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Tipo de rota" @@ -29685,5 +29681,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29694,17 +29690,17 @@ msgstr "bicicleta" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "ônibus" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "estrada" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "barca" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "Esqui" @@ -29772,5 +29768,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29780,9 +29776,9 @@ msgstr "a pé" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "bonde/VLT" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "desvio" @@ -29796,10 +29792,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "Metrô" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Descrição de símbolo" @@ -29807,31 +29803,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Rede" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "Proposto" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "alternativa" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "temporário" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "conexão" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Cor (hex)" @@ -29840,30 +29836,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "segmento de rota" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "segmento em frente" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "Ponto de parada" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "ponto de parada em frente" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "ponto de parada atrás" @@ -30090,5 +30086,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "depreciado" @@ -33416,11 +33412,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "lugar" @@ -33434,5 +33430,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" @@ -33787,4 +33783,122 @@ msgid "Sicily - Italy" msgstr "Sicilia - Italia" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "Um erro ocorreu durante a comunicação com o servidor.
Detalhes: " +#~ "{0}" + +#~ msgid "Communication with server failed" +#~ msgstr "A comunicação com o servidor falhou" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Sim, repô-los também" + +#~ msgid "No, cancel operation" +#~ msgstr "Não, cancelar operação" + +#~ msgid "" +#~ "There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgid_plural "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" +#~ msgstr[0] "" +#~ "Existe {0} nó adicional usado pelo caminho {1}
que está apagado no " +#~ "servidor.

Você quer recuperar este nó também?" +#~ msgstr[1] "" +#~ "Existem {0} nós adicionais usados pelo caminho {1}
que estão apagados " +#~ "no servidor.

Você quer recuperar estes nós também?" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Desfazer a remoção dos nós adicionais?" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "Existe {0} primitivo adicional referenciado pela relação {1}
que foi " +#~ "removido no servidor.

Você quer desfazer a remoção deste primitivo " +#~ "também?" +#~ msgstr[1] "" +#~ "Existem {0} primitivos adicionais referenciados pela relação {1}
que " +#~ "foram removidos no servidor.

Você quer desfazer a remoção destes " +#~ "primitivos também?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Recuperar primitivas dependentes?" + +#~ msgid "Visible State:" +#~ msgstr "Estado Visível:" + +#~ msgid "visible (on the server)" +#~ msgstr "visível (no servidor)" + +#~ msgid "not visible (on the server)" +#~ msgstr "não visível (no servidor)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Mantenha uma cópia da versão local" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Eliminar fisicamente os dados locais" + +#~ msgid "Keep my visible state" +#~ msgstr "Manter meu estado visível" + +#~ msgid "Yes, reset the id" +#~ msgstr "Sim, resetar id" + +#~ msgid "" +#~ "To keep your local version, JOSM
has to reset the id of " +#~ "primitive {0} to 0.
On the next upload the server will assign
it a " +#~ "new id.
Do you agree?" +#~ msgstr "" +#~ "Para manter sua versão local, o JOSM
tem que resetar o ID da " +#~ "primitiva {0} para zero.
Na próximo envio, o servidor vai " +#~ "atribuir
um novo ID.
Você concorda?" + +#~ msgid "Reset id to 0" +#~ msgstr "Resetar id para 0" + +#~ msgid "Keep their visible state" +#~ msgstr "Manter seu estado visível" + +#~ msgid "Yes, purge it" +#~ msgstr "Sim, limpe-o" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ " JOSM terá de remover sua primitiva local com id {0}
dos " +#~ "dados.
Concorda? " + +#~ msgid "Remove from dataset" +#~ msgstr "Remover do conjuto de dados" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Não decidir conflito entre diferentes estados de visibilidade" + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "{0} conflito ainda não foi resolvido.

Por favor, abra a janela de " +#~ "Lista de Conflitos e resolva-o manualmente." +#~ msgstr[1] "" +#~ "{0} conflitos ainda não foram resolvidos.

Por favor, abra a janela " +#~ "de Lista de Conflitos e resolva-os manualmente." + +#~ msgid "football" +#~ msgstr "futebol americano" #~ msgid "Preparing..." Index: /applications/editors/josm/i18n/po/ro.po =================================================================== --- /applications/editors/josm/i18n/po/ro.po (revision 22208) +++ /applications/editors/josm/i18n/po/ro.po (revision 22209) @@ -8,7 +8,7 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-26 17:24+0000\n" -"Last-Translator: Robert Damian \n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-28 16:47+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 " "== 0) && (n != 0))) ? 2: 1));\n" -"X-Launchpad-Export-Date: 2010-06-28 14:54+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: ROMANIA\n" @@ -31,5 +31,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -73,5 +73,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -81,5 +81,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -241,5 +241,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -247,6 +247,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -334,8 +334,7 @@ msgstr "" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Adaugă Nod..." @@ -657,5 +656,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1038,5 +1037,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1045,5 +1044,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1180,4 +1179,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "" @@ -1451,6 +1451,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1669,6 +1669,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2281,5 +2279,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2511,10 +2509,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Caută..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Caută obiecte" @@ -2522,65 +2520,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Vă rog introduceţi un şir de căutat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "Înlocuieşte selecţia" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "adaugă la selecţie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "elimină din selecţie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2588,38 +2586,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2627,5 +2625,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2633,5 +2631,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2639,5 +2637,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2645,9 +2643,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2655,39 +2653,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2695,12 +2693,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2709,38 +2707,50 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Căutare" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +msgid "Invalid search expression" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2748,5 +2758,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2754,5 +2764,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2760,5 +2770,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2766,5 +2776,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2885,8 +2895,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3025,5 +3035,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3148,11 +3158,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3161,5 +3171,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3168,5 +3178,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3204,5 +3214,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3511,6 +3521,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3520,10 +3530,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3531,5 +3541,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3538,5 +3548,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3544,78 +3554,4 @@ #, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -3749,5 +3685,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "fundal" @@ -3917,5 +3853,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "" @@ -3936,7 +3872,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4003,7 +3939,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "" @@ -4092,5 +4028,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4307,5 +4243,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4604,12 +4540,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4620,6 +4556,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4627,6 +4563,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4634,9 +4570,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4645,5 +4581,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4652,26 +4588,26 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4679,25 +4615,25 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "" @@ -4743,5 +4679,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "" @@ -4752,5 +4688,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4764,5 +4700,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "" @@ -4831,5 +4767,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4841,5 +4777,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "" @@ -4938,60 +4874,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4999,123 +4884,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "şters" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" msgstr "" @@ -5263,5 +5083,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "" @@ -5341,7 +5161,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5351,6 +5171,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5536,5 +5356,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5594,25 +5414,25 @@ "mai sus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5624,22 +5444,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5652,43 +5472,122 @@ msgstr "Adaugă" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 +msgid "Enable filter" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 +msgid "Hide elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 -msgid "Enable filter" +msgid "Inverse filter" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 -msgid "Hide elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 -msgid "Inverse filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 msgid "Filter mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Exportă fișier GPX" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5731,37 +5630,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Introdu coordonatele pentru noul nod." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Foloseşte grade zecimale" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Valorile negative denotă emisfera Vestică/Sudică" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "" @@ -5821,5 +5720,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "" @@ -5867,10 +5766,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -5934,14 +5833,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6642,8 +6541,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6668,6 +6575,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7050,69 +6955,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Nume" @@ -7691,5 +7597,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8326,8 +8232,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "" @@ -8356,6 +8262,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "necunoscut" @@ -8676,5 +8582,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "" @@ -9192,4 +9098,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9691,5 +9598,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "" @@ -9738,5 +9645,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -9809,23 +9716,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9834,34 +9741,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -9870,32 +9754,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} constă în:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -12808,4 +12692,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14255,5 +14140,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14515,5 +14400,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "" @@ -14947,35 +14832,35 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 +msgid "on polygon" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "Adaugă nod" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -msgid "Create house number and street name relation" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +msgid "Next no" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Introduceţi parola" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15129,10 +15014,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15187,7 +15076,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15196,13 +15085,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15250,32 +15139,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15287,18 +15176,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15306,5 +15195,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15312,130 +15201,134 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15736,5 +15629,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -15743,14 +15636,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "" @@ -17008,4 +16901,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17046,9 +16958,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -18548,5 +18455,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "" @@ -18733,5 +18640,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "" @@ -19248,5 +19155,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "" @@ -19292,30 +19199,34 @@ msgstr "" -#. translation note: don't translate quoted words #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -20248,7 +20159,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Deschide un fişier." +msgstr "" #. Strings in JFileChooser @@ -20530,7 +20440,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20539,10 +20456,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20551,5 +20468,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20558,15 +20475,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20576,10 +20493,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20588,5 +20505,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20595,5 +20512,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20602,10 +20519,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20614,5 +20531,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20622,5 +20539,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20629,15 +20546,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20646,5 +20563,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -20777,5 +20694,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "" @@ -21314,5 +21231,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "" @@ -21325,5 +21242,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "" @@ -21628,8 +21545,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "" @@ -21740,8 +21657,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "" @@ -22047,5 +21964,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "" @@ -22165,5 +22082,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "" @@ -22311,4 +22228,9 @@ #: build/trans_presets.java:633 msgid "Edit Motorway Junction" +msgstr "" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" msgstr "" @@ -22362,13 +22284,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "" @@ -22636,6 +22558,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "" @@ -23487,5 +23409,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "" @@ -23856,24 +23778,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "" @@ -23940,23 +23862,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "" @@ -23970,23 +23892,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "" @@ -24000,23 +23922,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -24130,6 +24052,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "" @@ -24145,5 +24067,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "" @@ -24157,5 +24079,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "" @@ -24331,5 +24253,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "" @@ -24367,5 +24289,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "" @@ -24373,5 +24295,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "" @@ -24490,5 +24412,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "" @@ -25227,5 +25149,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "" @@ -25300,5 +25222,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25412,12 +25382,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25484,12 +25446,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25503,12 +25457,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -25670,5 +25616,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "" @@ -25695,4 +25642,9 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +msgid "american_football" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "" @@ -25720,4 +25672,9 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +msgid "canadian_football" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "" @@ -25760,5 +25717,5 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" +msgid "gaelic_football" msgstr "" @@ -25800,5 +25757,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +msgid "rugby_union" msgstr "" @@ -25919,6 +25881,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -25932,5 +25898,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -25952,4 +25917,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "" @@ -25973,6 +25940,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -25985,5 +25956,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26005,4 +25975,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "" @@ -26025,4 +25997,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "" @@ -26045,4 +26019,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "" @@ -26065,4 +26041,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -26264,158 +26242,185 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "" - -#. item "Sport (Ball)/Football" +msgid "Australian Football" +msgstr "" + +#. item "Sport (Ball)/Australian Football" #: build/trans_presets.java:2071 -msgid "Edit Football" +msgid "Edit Australian Football" msgstr "" #: build/trans_presets.java:2076 -msgid "Australian Football" -msgstr "" - -#. item "Sport (Ball)/Australian Football" +msgid "American Football" +msgstr "" + +#. item "Sport (Ball)/American Football" #: build/trans_presets.java:2077 -msgid "Edit Australian Football" +msgid "Edit American Football" msgstr "" #: build/trans_presets.java:2082 +msgid "Canadian Football" +msgstr "" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +msgid "Edit Canadian Football" +msgstr "" + +#: build/trans_presets.java:2088 +msgid "Gaelic Football" +msgstr "" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +msgid "Edit Gaelic Football" +msgstr "" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +msgid "Edit Rugby League" +msgstr "" + +#: build/trans_presets.java:2100 +msgid "Rugby Union" +msgstr "" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +msgid "Edit Rugby Union" +msgstr "" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "" @@ -26423,5 +26428,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "" @@ -26429,10 +26434,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "" @@ -26440,10 +26445,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "" @@ -26451,10 +26456,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "" @@ -26463,10 +26468,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "" @@ -26475,10 +26480,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "" @@ -26488,10 +26493,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "" @@ -26500,10 +26505,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "" @@ -26511,5 +26516,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "" @@ -26517,15 +26522,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "" @@ -26533,10 +26538,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "" @@ -26544,10 +26549,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "" @@ -26555,5 +26560,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "" @@ -26561,5 +26566,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "" @@ -26568,10 +26573,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "" @@ -26580,9 +26585,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "" @@ -26590,10 +26595,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "" @@ -26602,10 +26607,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "" @@ -26615,5 +26620,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "" @@ -26622,6 +26627,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "" @@ -26630,66 +26635,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "" @@ -26698,81 +26703,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "" @@ -26781,5 +26786,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "" @@ -26787,5 +26792,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "" @@ -26793,25 +26798,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "" @@ -26820,5 +26825,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "" @@ -26826,61 +26831,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "" @@ -26888,25 +26893,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "" @@ -26914,10 +26919,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "" @@ -26925,10 +26930,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "" @@ -26937,41 +26942,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "" @@ -26981,10 +26986,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "" @@ -26992,5 +26997,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "" @@ -26998,10 +27003,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "" @@ -27009,10 +27014,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "" @@ -27020,23 +27025,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "" @@ -27046,35 +27051,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "" @@ -27083,10 +27088,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "" @@ -27095,5 +27100,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "" @@ -27101,10 +27106,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "" @@ -27115,23 +27120,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "" @@ -27140,74 +27145,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "" @@ -27216,5 +27221,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "" @@ -27222,5 +27227,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "" @@ -27228,5 +27233,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "" @@ -27234,5 +27239,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "" @@ -27240,5 +27245,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "" @@ -27246,15 +27251,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "" @@ -27263,5 +27268,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "" @@ -27269,35 +27274,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "" @@ -27305,5 +27310,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "" @@ -27312,31 +27317,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "" @@ -27415,5 +27420,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27423,31 +27428,31 @@ msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "" @@ -27456,30 +27461,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "" @@ -27488,10 +27493,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "" @@ -27500,10 +27505,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "" @@ -27512,5 +27517,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "" @@ -27518,5 +27523,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "" @@ -27524,15 +27529,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "" @@ -27540,10 +27545,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "" @@ -27552,28 +27557,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "" @@ -27581,9 +27586,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "" @@ -27591,27 +27596,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "" @@ -27619,9 +27624,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "" @@ -27629,9 +27634,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "" @@ -27639,18 +27644,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "" @@ -27658,54 +27663,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "" @@ -27713,9 +27718,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "" @@ -27723,9 +27728,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "" @@ -27733,54 +27738,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "" @@ -27788,9 +27793,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "" @@ -27798,9 +27803,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "" @@ -27808,24 +27813,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "" @@ -27833,5 +27838,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "" @@ -27839,97 +27844,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "" @@ -27937,14 +27942,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "" @@ -27952,5 +27957,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "" @@ -27958,15 +27963,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "" @@ -27974,18 +27979,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "" @@ -27993,5 +27998,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "" @@ -27999,9 +28004,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "" @@ -28009,10 +28014,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "" @@ -28021,5 +28026,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "" @@ -28028,20 +28033,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -28049,5 +28054,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "" @@ -28056,64 +28061,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "" @@ -28121,15 +28126,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "" @@ -28137,10 +28142,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "" @@ -28148,25 +28153,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "" @@ -28174,5 +28179,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "" @@ -28180,10 +28185,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "" @@ -28191,10 +28196,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "" @@ -28202,5 +28207,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "" @@ -28208,5 +28213,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "" @@ -28214,10 +28219,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "" @@ -28225,10 +28230,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "" @@ -28236,10 +28241,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "" @@ -28247,70 +28252,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "" @@ -28319,15 +28324,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "" @@ -28336,5 +28341,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "" @@ -28342,17 +28347,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "" @@ -28361,14 +28366,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "" @@ -28376,25 +28381,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "" @@ -28402,10 +28407,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "" @@ -28413,5 +28418,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "" @@ -28419,5 +28424,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "" @@ -28426,45 +28431,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "" @@ -28472,25 +28477,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "" @@ -28498,10 +28503,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "" @@ -28509,20 +28514,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "" @@ -28530,5 +28535,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -28536,15 +28541,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "" @@ -28552,9 +28557,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "" @@ -28562,39 +28567,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "" @@ -28602,15 +28607,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "" @@ -28618,50 +28623,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "" @@ -28671,5 +28676,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "" @@ -28681,5 +28686,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "" @@ -28687,5 +28692,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "" @@ -28693,5 +28698,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -28702,5 +28707,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -28708,36 +28713,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -28745,5 +28750,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "" @@ -28752,5 +28757,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "" @@ -28758,34 +28763,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "" @@ -28794,15 +28799,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "" @@ -28810,5 +28815,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "" @@ -28817,5 +28822,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "" @@ -28823,5 +28828,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "" @@ -28929,5 +28934,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -28938,17 +28943,17 @@ msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "" @@ -29016,5 +29021,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29024,9 +29029,9 @@ msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "" @@ -29040,10 +29045,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "" @@ -29051,31 +29056,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "" @@ -29084,30 +29089,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "" @@ -29334,5 +29339,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "" @@ -32660,11 +32665,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "" @@ -32678,5 +32683,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" Index: /applications/editors/josm/i18n/po/ru.po =================================================================== --- /applications/editors/josm/i18n/po/ru.po (revision 22208) +++ /applications/editors/josm/i18n/po/ru.po (revision 22209) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-28 12:45+0000\n" -"Last-Translator: Calibrator \n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-07-04 11:29+0000\n" +"Last-Translator: J-Wills \n" "Language-Team: Koptev Oleg \n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "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: 2010-06-28 14:49+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:08+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" @@ -30,5 +30,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -72,5 +72,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -80,5 +80,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -247,5 +247,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -253,6 +253,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -342,8 +342,7 @@ msgstr "Не выбран слой" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Добавить точку..." @@ -667,5 +666,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1052,5 +1051,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1059,5 +1058,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1198,4 +1197,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Двигать точку" @@ -1497,6 +1497,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1719,6 +1719,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2382,5 +2380,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2634,10 +2632,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Поиск..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Поиск объектов." @@ -2645,66 +2643,66 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Пожалуйста, введите строку фильтра" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Пожалуйста, введите строку для поиска." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Введите выражение для поиска" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "заменить выделение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "добавить к выделению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "убрать из выделения" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "найти в выделенном" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "регистрозависимый" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "все объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "Включить в поиск незаконченные и удалённые объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "регулярное выражение" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" "Baker Street - ''Baker'' и ''Street'' в любом ключе или названии." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "\"Baker Street\" - ''Baker Street'' в любом ключе или названии." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak - ''Bak'' в любом месте названия." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - ключ ''type'' с точным значением ''route''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2714,21 +2712,21 @@ "*=value, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - название не содержит ''Bak''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "oneway? - oneway=yes, true, 1 или on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot установить в любое значение." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Специальные цели:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2737,18 +2735,18 @@ "(линия), relation(отношение)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - все объекты, изменённые пользователем" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" "user:anonymous - все объекты, изменённые анонимным пользователем" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - объект с данным ID (0 для новых объектов)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2758,5 +2756,5 @@ "версии)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2766,5 +2764,5 @@ "назначенного пакета правок)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2774,5 +2772,5 @@ "nodes:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2782,9 +2780,9 @@ "мин-макс)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "role:… — объект с указанной ролью в отношении" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2794,21 +2792,21 @@ "12T14:51:09Z, 2009-11-12 или T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - все изменённые объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - все выделенные объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - все незаконченные объекты" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - все объекты без тегов" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2817,5 +2815,5 @@ "выражению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2824,5 +2822,5 @@ "выражению" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "" @@ -2830,5 +2828,5 @@ "«или»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2836,5 +2834,5 @@ ":)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2844,12 +2842,12 @@ "дополнительный обратный слэш (вот так: \\\" и \\\\)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Используйте ( и ) для группировки выражений" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2858,38 +2856,51 @@ msgstr "Фильтр" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Поиск" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Принять фильтр" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Начать поиск" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Введите выражение для поиска" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Не найдено совпадений для ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Ничего не удалено из выделения в результате поиска ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Ничего не найдено в выделенном, при поиске ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2897,5 +2908,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2903,5 +2914,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2909,5 +2920,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2915,5 +2926,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -3052,8 +3063,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3197,5 +3208,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3330,11 +3341,11 @@ msgstr[2] "Переместить {0} точек" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Очищеный объект ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3344,5 +3355,5 @@ msgstr[2] "Очищено {0} объектов" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3353,5 +3364,5 @@ "Текущее значение {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3390,5 +3401,5 @@ msgstr "Уладить {0} конфликтов тегов в отношении {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3730,6 +3741,6 @@ "критическая ошибка, но необходимо сохраниться, прежде чем продолжить работу." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3739,10 +3750,10 @@ msgstr "Отстутствует результат слияния для линии с id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Отстутствует результат слияния для объекта с id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3750,5 +3761,5 @@ msgstr "Отстутствует результат слияния для точки с id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3757,5 +3768,5 @@ msgstr "Отстутствует результат слияния для отношения с id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3764,79 +3775,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "Отсутствует результат слияния типа {0} с id {1}" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "E" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "H" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Текст" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "R" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "A" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "D" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "F" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

Фильтр активен

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} объектов скрыто" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "Отключено редактирование {0} объектов." - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "" -"

Закройте диалог фильтра, если хотите увидеть все объекты.

" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3975,5 +3911,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "фон" @@ -4098,15 +4034,13 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29 msgid "Guyane RGFG95" -msgstr "" +msgstr "Гвиана RGFG95" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (Франция)" +msgstr "Франция UTM (DOM)" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "Северная геодезическая система UTM20" +msgstr "Система координат UTM" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4148,5 +4082,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "железная дорога" @@ -4167,7 +4101,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4235,7 +4169,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "здание" @@ -4325,5 +4259,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4557,5 +4491,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4871,12 +4805,12 @@ msgstr "роль {0} не участвует в паре сравнения {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Параметры" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4887,6 +4821,6 @@ msgstr "Теги" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4894,6 +4828,6 @@ msgstr "Точки" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4901,9 +4835,9 @@ msgstr "Участники" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Нет конфликтов тегов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4913,5 +4847,5 @@ msgstr[2] "Теги({0} конфликтов)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4921,9 +4855,9 @@ msgstr[2] "Предстоит уладить {0} отложенных кофликта тегов" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Точки (без конфликтов)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4932,17 +4866,17 @@ "точек этой линии." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Точки (с конфликтами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Неулаженные конфликты в списке точек этой линии" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Члены (без конфликтов)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4952,25 +4886,25 @@ "конфликтов в списке участников этого отношения." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Участники отношения (с конфликтами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Неулаженные конфликты в списке участников этого отношения" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Нет актуальных конфликтов свойств" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Свойства (с конфликтами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Конфликты свойств, ожидающие улаживания" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Конфликт в разрешении изображения" @@ -5018,5 +4952,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Моя версия" @@ -5027,5 +4961,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -5041,5 +4975,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Их версия" @@ -5118,5 +5052,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -5128,5 +5062,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Вниз" @@ -5236,76 +5170,9 @@ "устранения конфликтов." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" -"Произошла ошибка во время соединения с сервером
Подробности: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Связь с сервером прервана" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Да, восстановить их тоже" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "Нет, отменить действие" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -"Имеется {0} дополнительная точка, используемая в линии {1}
, которая " -"удалена на сервере.

Вы хотите восстановить и эту точку тоже?" -msgstr[1] "" -"Имеется {0} дополнительные точки, используемых в линии {1}
, которые " -"удалены на сервере.

Вы хотите восстановить и эти точки тоже?" -msgstr[2] "" -"Имеется {0} дополнительных точек, используемых в линии {1}
, которые " -"удалены на сервере.

Вы хотите восстановить и эти точки тоже?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Восстановить дополнительные точки?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -"Имеется {0} дополнительный элемент, входящий в отношение {1}
, который " -"удалён на сервере.

Вы хотите восстановить и этот элемент тоже?" -msgstr[1] "" -"Имеется {0} дополнительных элемента, входящие в отношение {1}
, которые " -"удалены на сервере.

Вы хотите восстановить и эти элементы тоже?" -msgstr[2] "" -"Имеется {0} дополнительных элементов, входящих в отношение {1}
, которые " -"удалены на сервере.

Вы хотите восстановить и эти элементы тоже?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Восстановить связанные элементы?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Свойства в моём наборе данных, то есть локальном наборе данных" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5315,129 +5182,59 @@ "при применении объединения." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Свойства в их наборе данных, то есть серверном наборе данных" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Координаты:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Удалён:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Видим:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "Ссылаются:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(отсутствует)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "удалён" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "не удалён" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "видим (на сервере)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "невидим (на сервере)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Оставить клон локальной версии" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Физически удалить из локального набора данных" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Оставить мои координаты" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Оставить их координаты" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "Не улаживать конфликт между различными координатами" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "Оставить моё состояние \"Удалён\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "Оставить их состояние \"Удалён\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "Не улаживать конфликт между удалёнными состояниями" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "Оставить моё состояние \"Видим\"" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Да, сбросить id" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" -"Чтобы сохранить вашу локальную версию, JOSM
сбросит id элемента {0} " -"в 0.
При следующей загрузке, сервер назначит
ему новый id.
Вы " -"согласны?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "Сбросить в 0" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Оставить их состояние \"Видим\"" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Да, очистить" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM удалит ваш локальный элемент с id {0}
из набора данных.
Вы " -"согласны?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Удалить из набора данных" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "Не улаживать конфликт между видимыми состояниями" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5588,5 +5385,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "все" @@ -5667,7 +5464,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5678,6 +5475,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5886,5 +5683,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5942,25 +5739,25 @@ msgstr "Выделить на карте объекты, выбранные в списке вверху." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Отменить улаживание конфликтов и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Применить улаживание конфликтов и закрыть диалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Применить устранение конфликтов" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Закрыть в любом случае" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Продолжить решение" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5977,22 +5774,22 @@ "{1}, чтобы вернуться к улаживанию конфликтов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "Конфликт улажен не полностью" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Уладить конфликты" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Уладить конфликты для ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Отфильтровать объекты и скрыть/отключить их." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -6005,44 +5802,124 @@ msgstr "Добавить" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "Добавить фильтр." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Редактировать фильтр." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Удалить фильтр." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Переместить фильтр вверх." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Переместить фильтр вниз." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Включить фильтр" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Скрыть элементы" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Инвертировать фильтр" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Режим фильтра" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "Фильтром спрятано:{0}, отключено:{1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Ошибка при загрузке файла" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "E" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "H" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Текст" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "R" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "A" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "D" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

Фильтр активен

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} объектов скрыто" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "Отключено редактирование {0} объектов." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "" +"

Закройте диалог фильтра, если хотите увидеть все объекты.

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -6084,37 +5961,37 @@ msgstr "Подробная информация" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Введите координаты новой точки" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Использовать десятичные градусы" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Отрицательные значения обозначают западное/южное полушарие" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Пожалуйста , введите правильную широту в диапазоне -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Введите широту в диапазоне -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Пожалуйста, введите правильную долготу в диапазоне -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Введите долготу в диапазоне -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Закрыть диалог и создать новую точку" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Закрыть диалог, не создавая новую точку" @@ -6174,5 +6051,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Отношения" @@ -6220,10 +6097,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "Докачать с сервера участников выбранных отношений" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "Докачать участников" @@ -6287,14 +6164,14 @@ msgstr "Яч.: Связ.:{0} / Линий:{1} / Точек:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Выбор: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "Получить подробную информацию о внутреннем состоянии объектов." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "Проверить" @@ -7012,8 +6889,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -7038,6 +6923,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7420,69 +7303,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Название" @@ -8115,5 +7999,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8810,8 +8694,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Тип" @@ -8840,6 +8724,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "неизвестно" @@ -9196,5 +9080,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Обнаружены конфликты" @@ -9794,4 +9678,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -10367,5 +10252,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Описание" @@ -10418,5 +10303,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10495,24 +10380,24 @@ "проигнорированы при расчете времени." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Слой данных {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "вне области для скачивания" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "версия {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" "Внимание: совместное использование данных версий 0.6 и 0.5 в версии 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10522,51 +10407,11 @@ msgstr[2] "Обнаружено {0} конфликтов." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -"{0} конфликт был улажен автоматически путём очистки {0} " -"объекта
из локального набора данных, так как объект уже был удалён на " -"сервере." -msgstr[1] "" -"{0} конфликта было улажено автоматически путём очистки {0} " -"объектов
из локального набора данных, так как объекты уже были удалёны на " -"сервере." -msgstr[2] "" -"{0} конфликтов было улажено автоматически путём очистки {0} " -"объектов
из локального набора данных, так как объекты уже были удалёны на " -"сервере." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"Осталось уладить {0} конфликт.

Пожалуйста, откройте диалог списка " -"конфликтов и уладьте конфликт вручную." -msgstr[1] "" -"Осталось уладить {0} конфликта.

Пожалуйста, откройте диалог списка " -"конфликтов и уладьте конфликты вручную." -msgstr[2] "" -"Осталось уладить {0} конфликтов.

Пожалуйста, откройте диалог списка " -"конфликтов и уладьте конфликты вручную." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "Нажмите, чтобы закрыть этот диалог и продолжить правку" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10576,32 +10421,32 @@ msgstr[2] "{0} удалено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} состоит из:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "отключено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "Версия API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Преобразовать в слой GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "Тест согласованности набора данных" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "Проблемы не обнаружены" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "Обнаружены следующие проблемы:" @@ -13819,4 +13664,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -15452,5 +15298,5 @@ "

Сообщение об ошибке:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15748,5 +15594,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Интерполяция адресов" @@ -16273,36 +16119,37 @@ msgstr "Укажите ширину здания" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Мультиполигон" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "адрес" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Создать новое отношение" +msgstr "Добавить адрес" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Здания" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Номер" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Следующее" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Улица" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Адреса" +msgstr "Ввести адреса" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -16472,11 +16319,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "Отменить обрезку изображения во время геопривязки" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." msgstr "Сначала выберите слой WMS в списке." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." +msgstr "" #. item "Man Made/Pipeline" combo "Type" @@ -16530,7 +16381,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -16539,13 +16390,13 @@ msgstr "вода" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "символ" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "участок" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "номер участка" @@ -16593,32 +16444,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "адрес" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "район" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "раздел" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "коммуна" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Включить автоматическое кеширование." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Макс. размер кеша (МБ)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16636,18 +16487,18 @@ "данных, созданный этим модулем." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "WMS французского кадастра" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "Значение тега \"source\" когда включенs автоисточники" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Источник" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16656,5 +16507,5 @@ "Заменить оригинальный белый фон на цвет фона, заданный в настройках JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16664,129 +16515,129 @@ "Полезно для текстов на темном фоне." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Позволяет накладывать несколько слоёв" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Установить прозрачность слоев WMS. Справа непрозрачный, слева прозрачный." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Нарисовать прямоугольник вокруг данных, скачанных с сервера WMS." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "Разрешение изображения:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "Высокое разрешение (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "Среднее разрешение (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "Низкое разрешение (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "Интерполяционный фильтр изображения:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Ближайший-Сосед (быстро) [ По умолчанию]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "Билинейная (быстро)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "Бикубическая (медленно)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "Коэффициент захвата векторных изображений:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "Захватить весь экран в одно изображение" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Захватить мелкие изображения (высокое качество, но использует больше памяти)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "Фиксированный размер площади (по умолчанию 100 м)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Фиксированный размер (от 25 до 1000 метров)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "Слои:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "Моря, реки, бассейны." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "Здания, убежища, подземные сооружения." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "Символ, похожий на православный крест." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "Участки." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "Номера участков, названия улиц." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "Адреса, номера домов." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "Населённые пункты, деревни, местности" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "Разделы и подразделы кадастра." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "Муниципальные административные границы." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "Коэффициент захвата растровых изображений:" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "Показать перекрестья:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Более старые файлы автоматически удаляются, когда этот размер превышен" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16795,4 +16646,8 @@ "Автоматически выбирается первый слой WMS во время захвата, если существует " "несколько слоёв." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 @@ -17115,5 +16970,5 @@ msgstr "Общий квадрат: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -17124,14 +16979,14 @@ "Создайте новый файл." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Ошибка формата кеша" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "Ошибка кеширования зоны Ламберта" @@ -18430,4 +18285,26 @@ msgstr "Тащите, чтобы масштабировать изображение по оси Y" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +#, fuzzy +msgid "Create Stops from GTFS ..." +msgstr "Создать контрольные точки из GPX ..." + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +#, fuzzy +msgid "Create Stops from a GTFS file" +msgstr "Создать контрольные точки из файла GPX" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "Произошло ошибка ввода/вывода \"{0}\"" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +#, fuzzy +msgid "GTFS-Stops" +msgstr "Остановки" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -18469,9 +18346,4 @@ msgid "Create Stops from a GPX file" msgstr "Создать контрольные точки из файла GPX" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" -msgstr "Произошло ошибка ввода/вывода \"{0}\"" #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83 @@ -20089,5 +19961,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Другие" @@ -20279,5 +20151,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Мультиполигон" @@ -20718,5 +20590,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:115 msgid "More than one \"to\" way found" -msgstr "Обнаружен больше чем одинпуть \"куда\"" +msgstr "Обнаружен больше чем один путь \"куда\"" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TurnrestrictionTest.java:117 @@ -20808,5 +20680,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "полигон" @@ -20850,36 +20722,39 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Нет данных" - -#. translation note: don't translate quoted words +msgstr "Без тегов" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "Не соединённые точки без тегов" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +msgstr "Имеются тег, содержащий ''fixme'' или ''FIXME''" + +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +msgstr "Имеется ключ ''note'' или ''comment'' или ''description''" + +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +msgstr "Имеется ключ ''created_by'' или ''converted_by''" + +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +msgstr "Имеется ключ ''watch''" + +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" -msgstr "" +msgstr "Имеется ключ ''source''" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:62 @@ -20902,7 +20777,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Линии без тегов" +msgstr "Линии без тегов (комментированные)" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -21459,5 +21333,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:169 msgid "Overlap tiles" -msgstr "Накладывающиеся квадраты карты" +msgstr "Перекрытие квадратов карты" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:170 @@ -21471,5 +21345,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:186 msgid "Simultaneous connections" -msgstr "одновременно соединений" +msgstr "Одновременно соединений" #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11 @@ -21740,7 +21614,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:23 -#, fuzzy msgid "Abort file chooser dialog" -msgstr "Отменить диалог выбора файла." +msgstr "Закрыть диалоговое окно выбора файла" #. Strings in JFileChooser @@ -21852,5 +21725,4 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" msgstr "Открыть выбранный файл" @@ -22170,7 +22042,14 @@ msgstr "Модуль для отката пакетов правок" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -22181,10 +22060,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Предоставляет возможности маршрутизации." #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -22196,5 +22075,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -22205,15 +22084,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Позволяет добавлять метки/точки в текущей GPS позиции." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Показывает окно для редактирования тегов в табличной сетке." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -22226,10 +22105,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "Сделать ряд домов вдоль улицы из одного блока." #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -22241,5 +22120,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -22250,5 +22129,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -22259,10 +22138,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "Позволяет восстанавливать объекты, удаленные из базы данных OSM" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -22274,5 +22153,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -22285,5 +22164,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -22294,15 +22173,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "Быстрое скачивание вдоль большого набора связанных линий" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "Выделить последовательность неветвящихся соединённых линий" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -22314,5 +22193,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -22447,5 +22326,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Обозначение" @@ -22942,5 +22821,5 @@ #: build/trans_presets.java:619 build/trans_presets.java:1254 msgid "paved" -msgstr "асфальтированная" +msgstr "негрунтовая дорога" #: build/trans_presets.java:264 build/trans_presets.java:282 @@ -22953,5 +22832,5 @@ #: build/trans_presets.java:1254 msgid "unpaved" -msgstr "неасфальтированная" +msgstr "грунтовая дорога" #: build/trans_presets.java:264 build/trans_presets.java:282 @@ -22984,5 +22863,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "металл" @@ -22995,5 +22874,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "древесина" @@ -23298,8 +23177,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "да" @@ -23410,8 +23289,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "нет" @@ -23717,5 +23596,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "служебный проезд" @@ -23835,5 +23714,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "туристический" @@ -23982,4 +23861,9 @@ msgid "Edit Motorway Junction" msgstr "Свойства магистральной развязки" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Номер" #. item "Waypoints/Motorway Junction" text "Number" @@ -24032,13 +23916,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Оператор" @@ -24306,6 +24190,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Высота над уровнем моря" @@ -25157,5 +25041,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Напряжение" @@ -25526,24 +25410,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Часы работы" @@ -25610,23 +25494,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24/7" @@ -25640,23 +25524,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "Mo-Fr 08:30-20:00" @@ -25670,23 +25554,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00" @@ -25800,6 +25684,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Справочный номер" @@ -25815,5 +25699,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "подземная" @@ -25827,5 +25711,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Денежный сбор" @@ -26001,5 +25885,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Инвалидное кресло" @@ -26037,5 +25921,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Навес" @@ -26043,5 +25927,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Скамейка" @@ -26160,5 +26044,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Бакен" @@ -26897,5 +26781,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Спорт" @@ -26970,5 +26854,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -27082,12 +27014,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -27154,12 +27078,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -27173,12 +27089,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -27340,5 +27248,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "спорт" @@ -27365,4 +27274,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "австралийский футбол" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "австралийский футбол" @@ -27390,4 +27305,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "австралийский футбол" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "гребля на каное / каяке" @@ -27430,6 +27351,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "американский футбол" +#, fuzzy +msgid "gaelic_football" +msgstr "австралийский футбол" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27470,5 +27392,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "рэгби" @@ -27589,6 +27517,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -27602,5 +27534,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -27622,4 +27553,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "вид" @@ -27643,6 +27576,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -27655,5 +27592,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -27675,4 +27611,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "спортивное поле" @@ -27695,4 +27633,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "спортивный центр" @@ -27715,4 +27655,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "стадион" @@ -27735,4 +27677,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "трек" @@ -27934,158 +27878,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Американский футбол" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Свойства американского футбола" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Австралийский футбол" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Свойства австралийского футбола" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Австралийский футбол" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Свойства австралийского футбола" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Свойства американского футбола" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Свойства австралийского футбола" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Свойства американского футбола" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Свойства американского футбола" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Свойства регби" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Регби" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Свойства регби" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Бейсбол" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Свойства бейсбола" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Баскетбол" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Свойства бейсбола" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Гольф" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Свойства гольфа" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "поле для гольфа" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Бочче" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Свойства бочче" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Боулз" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Свойства боулз" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Крикет" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Свойства крикета" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Тренировочные сетки для крикета" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Свойства тренировочных сеток для крикет" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Крокет" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Свойства крокета" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Хоккей" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Свойства хокея" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Пелота" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Свойства пелоты" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Ракетбол" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Свойства ракетбола" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Регби" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Свойства регби" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Настольный теннис" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Свойства настольного тенниса" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Теннис" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Свойства тенниса" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Рукотворное" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Здание" @@ -28093,5 +28073,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Общественное здание" @@ -28099,10 +28079,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Свойства общественного здания" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Муниципалитет" @@ -28110,10 +28090,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Свойства муниципалитета" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Посольство" @@ -28121,10 +28101,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Свойства посольства" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Суд" @@ -28133,10 +28113,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Свойства суда" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Тюрьма" @@ -28145,10 +28125,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Свойства тюрьмы" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Полиция / милиция" @@ -28158,10 +28138,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "свойства полиции / милиции" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Пожарное депо" @@ -28170,10 +28150,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Свойства пожарного депо" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Почтовое отделение" @@ -28181,5 +28161,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Свойства почтамта" @@ -28187,15 +28167,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Детский сад" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Свойства детского сада" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Школа" @@ -28203,10 +28183,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Свойства школы" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Вуз" @@ -28214,10 +28194,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Свойства вуза" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Профессиональное училище" @@ -28225,5 +28205,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Свойства профессионального училища" @@ -28231,5 +28211,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Кинотеатр" @@ -28238,10 +28218,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Свойства кинотеатра" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Библиотека" @@ -28250,9 +28230,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Свойства библиотеки" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Центр искусств" @@ -28260,10 +28240,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Свойства центра искусств" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Театр" @@ -28272,10 +28252,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Свойства театра" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Культовое место" @@ -28285,5 +28265,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Свойства культового места" @@ -28292,6 +28272,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Религия" @@ -28300,66 +28280,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "бахаи" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "буддизм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "христианство" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "индуизм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "джайнизм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "иудаизм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "ислам" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "сикхизм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "спиритуализм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "даосизм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "унитарианство" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "зороастризм" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Конфессия" @@ -28368,81 +28348,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "англиканская" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "баптисты" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "католики" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "евангелисты" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "свидетели иеговы" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "лютеране" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "методисты" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "мормоны" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "православные" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "пятидесятники" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "пресвитериане" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "протестанты" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "квакеры" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "шииты" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "сунниты" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Адреса" @@ -28451,5 +28431,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Правка адресов" @@ -28457,5 +28437,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Номер дома" @@ -28463,25 +28443,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Название дома" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Улица" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Город" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Почтовый индекс" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Код страны" @@ -28490,5 +28470,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Править интерполяцию адресов" @@ -28496,61 +28476,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Схема нумерации" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "нечётные" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "чётные" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "алфавитный" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Рукотворное" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Цеха" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Свойства цехов" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Башня" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Свойства башни" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "Назначение башни" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "связная" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "наблюдательная" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Высота (в метрах)" @@ -28558,25 +28538,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Водонапорная башня" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Свойства водонапорной башни" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Газгольдер" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Свойства газгольдера" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Маяк" @@ -28584,10 +28564,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Свойства маяка" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Ветряная мельница" @@ -28595,10 +28575,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Свойства ветряной мельницы" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Трубопровод" @@ -28607,41 +28587,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Свойства трубопровода" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "газ" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "теплотрасса" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "нефть" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "канализация" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "любого назначения" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Расположение" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "подводная" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "надземная" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Очистные сооружения" @@ -28651,10 +28631,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Свойства чистных сооружений" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Кран" @@ -28662,5 +28642,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Свойства крана" @@ -28668,10 +28648,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Свойства бакена" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Геодезический пункт" @@ -28679,10 +28659,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Свойства геодезического пункта" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Камера наблюдения" @@ -28690,23 +28670,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Свойства камеры наблюдения" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "внутренняя" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "внешняя" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "общедоступное" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Электростанция" @@ -28716,35 +28696,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Свойства электростанции" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "ветряная" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "гидро" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "тепловая" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "атомная" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "угольная" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "солнечная" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Электроподстанция" @@ -28753,10 +28733,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Свойства электроподстанции" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Трансформаторная будка" @@ -28765,5 +28745,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Свойства трансформаторной будки" @@ -28771,10 +28751,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Табличка на линии электропередач" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Опора ЛЭП" @@ -28785,23 +28765,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Свойства опоры ЛЭП" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "вышка" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "столб" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "Номер вышки" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Линия электропередач" @@ -28810,74 +28790,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Свойства линии электропередач" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Тип линии" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "высоковольтная" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "среднего / низкого напряжения" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Количество токонесущих кабелей (без грозозащитных)" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Расщепление фаз (число раздельных проводов)" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "один провод" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "два провода" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "три провода" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "четыре провода" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Удобства" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Туалет" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "ограничено" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Примечание" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Почтовый ящик" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Телефон" @@ -28886,5 +28866,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Свойства телефона" @@ -28892,5 +28872,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Монеты" @@ -28898,5 +28878,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Банкноты" @@ -28904,5 +28884,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Электронные средства оплаты" @@ -28910,5 +28890,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Дебетные карты" @@ -28916,15 +28896,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Кредитные карты" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Телефонные карты" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Пункт приёма утильсырья" @@ -28933,5 +28913,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Свойства пункта приёма утильсырья" @@ -28939,35 +28919,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Батарейки" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Консервные банки" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Одежда" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Стекло" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Бумага" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Металлолом" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "Урна для мусора" @@ -28975,5 +28955,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Свойства урны для мусора" @@ -28982,31 +28962,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "Спинка" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Материал" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "камень" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "пластик" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Цвет" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "чёрный" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "коричневый" @@ -29085,5 +29065,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -29093,31 +29073,31 @@ msgstr "зелёный" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "красный" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "синий" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "серый" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "белый" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Количество мест" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Охотничья вышка" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Свойства охотничьей вышки" @@ -29126,30 +29106,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Высота" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "низкая" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "половинная" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "полная" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Скрытая" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Запирается" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Фонтан" @@ -29158,10 +29138,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Свойства фонтана" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Питьевая вода" @@ -29170,10 +29150,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Свойства питьевой воды" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Пожарный кран" @@ -29182,5 +29162,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Свойства пожарного крана" @@ -29188,5 +29168,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Детский дом" @@ -29194,15 +29174,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Свойства детского дома" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Магазины, служба быта" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Автомагазин" @@ -29210,10 +29190,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Свойства автомагазина" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Веломагазин" @@ -29222,28 +29202,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Свойства веломагазина" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Супермаркет" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Свойства супермаркета" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Бытовая химия" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Свойства магазина бытовой химии" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Небольшой магазин" @@ -29251,9 +29231,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Свойства магазина шаговой доступности" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Киоск" @@ -29261,27 +29241,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Свойства киоска" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Книжный магазин" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Свойства книжного магазина" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Туристическое агенство" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Свойства туристического агентства" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Мясная лавка" @@ -29289,9 +29269,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Свойства мясной лавки" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Булочная" @@ -29299,9 +29279,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Свойства булочной" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Цветочный магазин" @@ -29309,18 +29289,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Свойства цветочного магазина" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Натуральные продукты" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Свойства магазина натуральных продуктов" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Алкогольная продукция" @@ -29328,54 +29308,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Свойства магазина алкогольной продукции" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Напитки" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Свойства магазина напитков" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Компьютеры" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Свойства компьютерного магазина" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Бытовая электроника" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Свойства магазина бытовой электроники" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Звуковая аппаратура" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Свойства магазина звуковой аппаратуры" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Мебель" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Свойства мебельного магазина" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Садово-огородный магазин" @@ -29383,9 +29363,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Свойства садово-огородного магазина" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Хозяйственный магазин" @@ -29393,9 +29373,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Свойства хозяйственного магазина" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Магазин \"Сделай сам\"" @@ -29403,54 +29383,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Свойства магазина \"Сделай сам\"" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Канцтовары" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Свойства магазина канцтоваров" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Парикмахерская" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Свойства парикмахерской" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Обувь" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Свойство обувного магазина" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Игрушки" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Свойства магазина игрушек" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Видео" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Свойства магазина видео" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Химчистка" @@ -29458,9 +29438,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Свойства химчистки" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Прачечная" @@ -29468,9 +29448,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Свойства прачечной" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Товары для активного отдыха" @@ -29478,24 +29458,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Свойства магазина товаров для активного отдыха" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Свойства спортивного магазина" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Оптика" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Свойства магазина оптики" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Торговый автомат" @@ -29503,5 +29483,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Свойства торгового автомата" @@ -29509,97 +29489,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Реализуемая продукция" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "билеты на общественный транспорт" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "схемы общественного транспорта" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "талоны на парковку" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "продукты питания" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "напитки" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "сладости" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "сигареты" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "фотографии" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "еда для животных" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "газеты" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "игрушки" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "марки" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-карты" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "телефонные карты" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "ваучеры" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "велосипедная шина" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "презервативы" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "тампоны" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "пакеты для экскрементов" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "накопительные, дисконтные карты" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Финансы" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Банк" @@ -29607,14 +29587,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Свойства банка" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Банкомат" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Обмен валют" @@ -29622,5 +29602,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Свойства пункта обмена валют" @@ -29628,15 +29608,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Свойства банкомата" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Здравоохранение" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Врач" @@ -29644,18 +29624,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Свойства врача" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Стоматология" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Свойства стоматологии" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Аптека" @@ -29663,5 +29643,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Свойства аптеки" @@ -29669,9 +29649,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Отпуск лекарств по рецептам" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Больница" @@ -29679,10 +29659,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Свойства больницы" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Пункт экстренного вызова" @@ -29691,5 +29671,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Свойства пункта скорой помощи" @@ -29698,20 +29678,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Номер пункта" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Название точки" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Номер телефона" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Используйте международный код, например: +7-916-0857403)" @@ -29719,5 +29699,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Ветеринария" @@ -29726,64 +29706,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Свойства ветеринарии" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "География" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Места" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Континент" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Свойства континента" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Страна" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Свойства страны" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Штат" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Свойства штата" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Область" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Свойства области" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Округ" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Свойства округа" @@ -29791,15 +29771,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Город (более 100 000)" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Свойства большого города" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Город (до 100 000)" @@ -29807,10 +29787,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Свойствао малого города / посёлка" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Пригород" @@ -29818,25 +29798,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Свойства пригорода" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Село" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Свойства села" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Деревня" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Свойства деревни" @@ -29844,5 +29824,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Местность" @@ -29850,10 +29830,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Свойства местности" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Остров" @@ -29861,10 +29841,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Свойства острова" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Островок" @@ -29872,5 +29852,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Свойства островка" @@ -29878,5 +29858,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Вход в пещеру" @@ -29884,10 +29864,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Свойства входа в пещеру" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Вершина" @@ -29895,10 +29875,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Свойства вершины" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Ледник" @@ -29906,10 +29886,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Свойства ледника" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Вулкан" @@ -29917,70 +29897,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Свойства вулкана" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Границы" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Государственная" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Свойства государственной границы" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Административная" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Свойства административной границы" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Гражданская" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Свойства политико-административной границы" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Политическая" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Свойства политической границы" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Национальный парк" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Свойства национального парка" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Землепользование" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Дерево" @@ -29989,15 +29969,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Свойства дерева" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Научное название" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Лес" @@ -30006,5 +29986,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Свойства леса" @@ -30012,17 +29992,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "Хвойный" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "Лиственный" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "Смешанный" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Лесопосадки" @@ -30031,14 +30011,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Свойства лесопосадок" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Заповедник" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Свойства заповедника" @@ -30046,25 +30026,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Каменистая осыпь" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Свойства каменистой осыпи" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Заросли кустарника" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Свойства зарослей кустарника" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Каменистая пустошь" @@ -30072,10 +30052,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Свойства каменистой пустоши" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Пустырь" @@ -30083,5 +30063,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Свойства пустыря" @@ -30089,5 +30069,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Двор фермы" @@ -30096,45 +30076,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Свойства двора фермы" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Сельскохозяйственные угодья" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Свойства сельскохозяйственных угодий" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Сенокосный луг" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Свойства сенокосного луга" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Виноградники" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Свойства виноградников" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Огородные участки" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Свойства огородных участков" @@ -30142,25 +30122,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Сады" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Свойства садов" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Газон" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Свойства газона" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Площадка для праздников" @@ -30168,10 +30148,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Свойства площадки для праздников" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Общественные земли" @@ -30179,20 +30159,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Свойства общественных земель" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Парк" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Свойства парка" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Игровая площадка" @@ -30200,5 +30180,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Свойства игровой площадки" @@ -30206,15 +30186,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Жилая зона" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Свойства жилой зоны" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Погост" @@ -30222,9 +30202,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Свойства погоста" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Кладбище" @@ -30232,39 +30212,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Свойства кладбища" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Розничная торговля" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Свойства зоны розничной торговли" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Деловая территория" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Свойства деловой территории" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Промышленная территория" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Свойства промышленной территории" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Территория железной дороги" @@ -30272,15 +30252,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Свойства территории железной дороги" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Военная зона" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Свойства военной зоны" @@ -30288,50 +30268,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Строительная площадка" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Свойства стройплощадки" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Расчистка застройки" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Свойства расчистки застройки" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Зона под застройку" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Свойства зоны под застройку" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Свалка" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Свойства свалки" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Карьер" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Свойства карьера" @@ -30341,5 +30321,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Править мультиполигон" @@ -30351,5 +30331,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "внешний сегмент" @@ -30357,5 +30337,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "внутренний сегмент" @@ -30363,5 +30343,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "Граница" @@ -30372,5 +30352,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "Свойства границы" @@ -30378,36 +30358,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "Тип границы" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "административная" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "национальная" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "общины" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "политическая" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "Административный уровень" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "Подчиненная территория" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "Административный центр" @@ -30415,5 +30395,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Ограничение на поворот" @@ -30422,5 +30402,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Свойства ограничения на поворот" @@ -30428,34 +30408,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Ограничение" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "поворот налево запрещён" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "поворот направо запрещён" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "движение прямо запрещено" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "разворот запрещён" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "только направо" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "только налево" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "только прямо" @@ -30464,15 +30444,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "с линии" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "через точку или линию" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "на линию" @@ -30480,5 +30460,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Маршрут" @@ -30487,5 +30467,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Свойства маршрута" @@ -30493,5 +30473,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Тип маршрута" @@ -30599,5 +30579,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -30608,17 +30588,17 @@ msgstr "велосипедный" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "автобусный" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "трасса" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "паромный" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "лыжный" @@ -30686,5 +30666,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -30694,9 +30674,9 @@ msgstr "пеший" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "трамвайный" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "объездной" @@ -30710,10 +30690,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "линия метро" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Описание знака" @@ -30721,31 +30701,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Сеть" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "Состояние маршрута" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "планируемый" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "альтернативный" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "временный" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "соединяющий" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Цвет (hex)" @@ -30754,30 +30734,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "сегмент маршрута" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "сегмент вперёд" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "сегмент назад" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "конечная точка" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "конечная вперёд" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "конечная назад" @@ -31004,5 +30984,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "устаревший" @@ -34330,11 +34310,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "место" @@ -34348,5 +34328,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "данные TIGER" @@ -34702,4 +34682,157 @@ msgid "Sicily - Italy" msgstr "Sicily - Италия" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "Произошла ошибка во время соединения с сервером
Подробности: {0}" +#~ "" + +#~ msgid "Communication with server failed" +#~ msgstr "Связь с сервером прервана" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Да, восстановить их тоже" + +#~ msgid "No, cancel operation" +#~ msgstr "Нет, отменить действие" + +#~ msgid "" +#~ "There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgid_plural "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" +#~ msgstr[0] "" +#~ "Имеется {0} дополнительная точка, используемая в линии {1}
, которая " +#~ "удалена на сервере.

Вы хотите восстановить и эту точку тоже?" +#~ msgstr[1] "" +#~ "Имеется {0} дополнительные точки, используемых в линии {1}
, которые " +#~ "удалены на сервере.

Вы хотите восстановить и эти точки тоже?" +#~ msgstr[2] "" +#~ "Имеется {0} дополнительных точек, используемых в линии {1}
, которые " +#~ "удалены на сервере.

Вы хотите восстановить и эти точки тоже?" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Восстановить дополнительные точки?" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "Имеется {0} дополнительный элемент, входящий в отношение {1}
, который " +#~ "удалён на сервере.

Вы хотите восстановить и этот элемент тоже?" +#~ msgstr[1] "" +#~ "Имеется {0} дополнительных элемента, входящие в отношение {1}
, " +#~ "которые удалены на сервере.

Вы хотите восстановить и эти элементы " +#~ "тоже?" +#~ msgstr[2] "" +#~ "Имеется {0} дополнительных элементов, входящих в отношение {1}
, " +#~ "которые удалены на сервере.

Вы хотите восстановить и эти элементы " +#~ "тоже?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Восстановить связанные элементы?" + +#~ msgid "Visible State:" +#~ msgstr "Видим:" + +#~ msgid "visible (on the server)" +#~ msgstr "видим (на сервере)" + +#~ msgid "not visible (on the server)" +#~ msgstr "невидим (на сервере)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Оставить клон локальной версии" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Физически удалить из локального набора данных" + +#~ msgid "Keep my visible state" +#~ msgstr "Оставить моё состояние \"Видим\"" + +#~ msgid "Yes, reset the id" +#~ msgstr "Да, сбросить id" + +#~ msgid "" +#~ "To keep your local version, JOSM
has to reset the id of " +#~ "primitive {0} to 0.
On the next upload the server will assign
it a " +#~ "new id.
Do you agree?" +#~ msgstr "" +#~ "Чтобы сохранить вашу локальную версию, JOSM
сбросит id элемента " +#~ "{0} в 0.
При следующей загрузке, сервер назначит
ему новый id." +#~ "
Вы согласны?" + +#~ msgid "Reset id to 0" +#~ msgstr "Сбросить в 0" + +#~ msgid "Keep their visible state" +#~ msgstr "Оставить их состояние \"Видим\"" + +#~ msgid "Yes, purge it" +#~ msgstr "Да, очистить" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM удалит ваш локальный элемент с id {0}
из набора данных." +#~ "
Вы согласны?" + +#~ msgid "Remove from dataset" +#~ msgstr "Удалить из набора данных" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Не улаживать конфликт между видимыми состояниями" + +#~ msgid "" +#~ "{0} conflict has been resolved automatically by purging " +#~ "{0} object
from the local dataset because it is deleted on the server." +#~ msgid_plural "" +#~ "{0} conflicts have been resolved automatically by " +#~ "purging {0} objects
from the local dataset because they are deleted " +#~ "on the server." +#~ msgstr[0] "" +#~ "{0} конфликт был улажен автоматически путём очистки {0} " +#~ "объекта
из локального набора данных, так как объект уже был удалён на " +#~ "сервере." +#~ msgstr[1] "" +#~ "{0} конфликта было улажено автоматически путём очистки " +#~ "{0} объектов
из локального набора данных, так как объекты уже были " +#~ "удалёны на сервере." +#~ msgstr[2] "" +#~ "{0} конфликтов было улажено автоматически путём очистки " +#~ "{0} объектов
из локального набора данных, так как объекты уже были " +#~ "удалёны на сервере." + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "Осталось уладить {0} конфликт.

Пожалуйста, откройте диалог списка " +#~ "конфликтов и уладьте конфликт вручную." +#~ msgstr[1] "" +#~ "Осталось уладить {0} конфликта.

Пожалуйста, откройте диалог списка " +#~ "конфликтов и уладьте конфликты вручную." +#~ msgstr[2] "" +#~ "Осталось уладить {0} конфликтов.

Пожалуйста, откройте диалог " +#~ "списка конфликтов и уладьте конфликты вручную." + +#~ msgid "Create house number and street name relation" +#~ msgstr "Создать отношение для связи номера домов с улицей" + +#~ msgid "football" +#~ msgstr "американский футбол" + +#~ msgid "Football" +#~ msgstr "Американский футбол" #~ msgid "No data imported." Index: /applications/editors/josm/i18n/po/sk.po =================================================================== --- /applications/editors/josm/i18n/po/sk.po (revision 22208) +++ /applications/editors/josm/i18n/po/sk.po (revision 22209) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" "PO-Revision-Date: 2010-06-23 22:48+0000\n" "Last-Translator: Vlado \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -244,5 +244,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -250,6 +250,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -337,8 +337,7 @@ msgstr "Žiadne cieľové vrstvy" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Pridať bod..." @@ -660,5 +659,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1042,5 +1041,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1049,5 +1048,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1185,4 +1184,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Pres[vam bod..." @@ -1480,6 +1480,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1702,6 +1702,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2365,5 +2363,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2611,10 +2609,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Vyhľadávať..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Vyhľadávať objekty" @@ -2622,67 +2620,67 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Prosím vložte vybraný reťazec" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Zadajte hladaný reťazec." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Vložte hľadaný výraz" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "nahradiť označené" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "pridať k výberu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "odobrať z výberu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "Hľadať vo výbere" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "veľkosť písmen rozhoduje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "všetky objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "Tiež zahŕňať v hľadaní neúplné a odstránené objekty." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "regulárny výraz" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" "Baker Street - ''Baker'' a ''Street'' v akomkoľvek kľúči, alebo mene." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" "\"Baker Street\" - ''Baker Street'' v akomkoľvek kľúči, alebo mene." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak - ''Bak'' kdekoľvek v mene." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=cesta - kľúč ''type'' s presnou hodnotou ''cesta''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2692,21 +2690,21 @@ "b>, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - neobsahuje ''Bak'' v mene." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "oneway? - oneway=yes, true, 1 or on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - klúč 'foot' nastavený na akúkoľvek hodnotu." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Špeciálne ciele:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2715,18 +2713,18 @@ "b>)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - všetky objekty nahraté užívateľom" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" "užívateľ:anonymný - všetky objekty zmenené anonymnými užívateľmi" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - objekt s určeným ID (0 pre nové objekty)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2735,5 +2733,5 @@ "verzia:... - objekt s danou verziou (0 objektov bez priradenej verzie)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2743,5 +2741,5 @@ "priradeného súboru zmien)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2751,5 +2749,5 @@ "max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2759,9 +2757,9 @@ "alebo značky:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "úloha: ... - Objekt s danou úlohou vo vzťahu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2771,26 +2769,26 @@ "12T14:51:09Z, 2009-11-12 alebo T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - všetky zmenené objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - všetky vybraté objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - všetky nekompletné objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged - všetky neoznačené objekty" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" msgstr "dieťa výraz - všetky deti objektov vyhovujúcich výrazu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2798,13 +2796,13 @@ "rodič výraz - všetci rodičia objektov vyhovujúcich výrazu" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "Použite | alebo OR pri kombinácii s logickým \"alebo\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "Použite \" operátor citovania (e.g. ak kľúč obsahuje :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2814,12 +2812,12 @@ "g. \\\" and \\\\)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Použite ( a ) k zoskupeniu výrazov" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2828,38 +2826,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Hľadať" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Predložiť filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Začať vyhľadávanie" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Vložiť hľadaný výraz" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Neboli nájdené záznamy pre \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Nič nebolo pridané do výberu hľadaním \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Nič nebolo odstránené z výberu hľadaním \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Nič sa nenašlo vo výbere vyhľadávania pre ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2867,5 +2878,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2873,5 +2884,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2879,5 +2890,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2885,5 +2896,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -3017,8 +3028,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3162,5 +3173,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3295,11 +3306,11 @@ msgstr[2] "Posun {0} bodov" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Očistený objekt ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3309,5 +3320,5 @@ msgstr[2] "Očistených {0} objektov" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3318,5 +3329,5 @@ "je {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3355,5 +3366,5 @@ msgstr "Vyriešiť {0} konfliktné značky v relácii {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3694,6 +3705,6 @@ "kritická chyba, mali by ste bezpečne pokračovať vo vašej práci." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3703,10 +3714,10 @@ msgstr "Chýbajúci cieľ pre spojenie s cestou s id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Chýba zlúčujúci ciel pre objekt s id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3714,5 +3725,5 @@ msgstr "Chýba zlúčujúci ciel pre bod s id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3721,5 +3732,5 @@ msgstr "Chýba zlúčujúci ciel pre reláciu s id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3728,79 +3739,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "Chýba zlúčujúci ciel typu {0} s id {1}" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "E" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "H" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Text" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "R" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "A" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "D" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "F" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

Aktívny filter

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} skryté objekty" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "{0} vypnuté objekty" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "" -"

Zatvorte dialóg filtra, aby sa zobrazili všetky objekty.

" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3940,5 +3876,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "pozadie" @@ -4066,12 +4002,10 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (France)" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "UTM20 North Geodesic system" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4112,5 +4046,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "železnica" @@ -4131,7 +4065,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4199,7 +4133,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "budova" @@ -4289,5 +4223,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4519,5 +4453,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4832,12 +4766,12 @@ msgstr "funkcia {0} sa nenachádza v porovnávenej dvojici {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Vlastnosti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4848,6 +4782,6 @@ msgstr "Značky" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4855,6 +4789,6 @@ msgstr "Body" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4862,9 +4796,9 @@ msgstr "Členovia" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Nevyriešený konflikt značiek musí byť vyriešený" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4874,5 +4808,5 @@ msgstr[2] "Značky({0} konfliktov)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4882,9 +4816,9 @@ msgstr[2] "{0} nevyriešených konfliktov značiek na rozhodnutie" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Body(vyriešené)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4893,17 +4827,17 @@ "tejto ceste." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Body(v konflikte)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Nevyriešené konflikty v zozname bodov v tejto ceste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Členy(vyriešené)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4913,25 +4847,25 @@ "tejto relácii" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Členy(v konflikte)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Nevyriešené konflikty v zozname členov v tejto relácii" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Nevyriešený konflikt vo vlastnostiech" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Vlastnosti (s konfliktmi)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Nebyriešený konflikty vlastností musia byť vyriešené" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Rozhodnutie konfliktov" @@ -4979,5 +4913,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Moja verzia" @@ -4988,5 +4922,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -5002,5 +4936,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Ich verzia" @@ -5080,5 +5014,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -5090,5 +5024,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Dole" @@ -5196,75 +5130,9 @@ msgstr "Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" -"Nastala chyba počas komunikácie so serverom
Detaily: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Spojenie so serverom zlyhalo" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Áno, obnoviť ich tiež" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "Nie, zrušiť operáciu" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -"Nachádza sa tam {0} ďalší bod použitý v ceste {1}
ktorý je vymazaný na " -"servery.

Chcete obnoviť tento bod tiež?" -msgstr[1] "" -"Nachádza sa tam {0} ďalších bodov použitých v ceste {1}
ktoré sú vymazané " -"na servery.

Chcete obnoviť tieto body tiež?" -msgstr[2] "" -"Nachádzajú sa tam {0} ďalšie body použité v ceste {1}
ktoré sú vymazané " -"na servery.

Chcete obnoviť tieto body tiež?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Obnoviť pridané body?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -"Nachádza sa tam {0} ďalší pôvodný odkazujúci na reláciu {1}
ktorý je " -"vymazaný na servery.

Chcete obnoviť tento bod tiež?" -msgstr[1] "" -"Nachádza sa tam {0} ďalších pôvodných odkazujúcich na reláciu {1}
ktoré " -"sú vymazané na servery.

Chcete obnoviť tieto body tiež?" -msgstr[2] "" -"Nachádzajú sa tam {0} ďalšie pôvodné odkazujúce na reláciu {1}
ktoré sú " -"vymazané na servery.

Chcete obnoviť tieto body tiež?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Obnoviť pôvodné závislé odkazy?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Vlastnosti v mojej dátovej sade, i.e. lokálna dátová sada" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5274,126 +5142,59 @@ "elementoch, keď rozhodnutie o spojenie bude aplikované." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Vlastnosti v ich dátovej sade, i.e. serverova dátova sada" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Súradnice:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Vymazaný stav:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Viditeľný Stav:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "Odkazujúci na:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(žiadny)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "zmazané" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "nevymazaný" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "viditeľné (na servery)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "neviditeľné (na servery)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Zostáva klon lokálnej verzie" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Fyzicky vymazať z lokálnej verzie" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Ponechaj moje súradnice" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Ponechaj ich súradnice" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "Nerozhodnuté konflikty medzi rôznymi súradnicami" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "Udržať môj vymazaný stav" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "Udržať ich vymazaný stav" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "Nevyriešené konflikty medzi vymazávaným stavom" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "Zostáva môj viditeľný stav" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Áno, vynulovať id" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "Nastaviť id na 0" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Ponechať svoj viditeľný stav" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Áno, očistiť to" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM odstráni vaše lokálne pôvodné s id {0}
z dátovej sady." -"
Súhlasíte?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Odstrániť z dátovej sady" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "Nerozhodnutý konflikt medzi viditeľnými stavom" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5541,5 +5342,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "všetky" @@ -5620,7 +5421,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5631,6 +5432,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5838,5 +5639,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5898,25 +5699,25 @@ "vrchu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Zrušiť rozhodnutie konfliktu a zavrieť dialóg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Použiť rozhodnutie konfliktu a zavrieť dialóg" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Použiť rozhodnutie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Zavrieť akúkoľvek cestu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Pokračovanie rozhodnutia" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5933,22 +5734,22 @@ "pre návrat k riešeniu konfliktov." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "Konflikt nie je úplne vyriešený" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Rozhodnutie konfliktov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Rozhodnúť konflikt pre ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Filtrovať objekty a schovať/vypnúť ich." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5961,44 +5762,124 @@ msgstr "Pridať" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "Pridať filter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Upraviť filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Zmazať filter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Posunúť filter hore." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Posunúť filter dole." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Zapnúť filter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Schovať prvky" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Obrátený filter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Režim filter" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "Filter Skrytých:{0} Nepovolených:{1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Chyba pri nahrávaní súboru" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "E" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "H" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Text" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "R" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "A" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "D" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

Aktívny filter

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} skryté objekty" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "{0} vypnuté objekty" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "" +"

Zatvorte dialóg filtra, aby sa zobrazili všetky objekty.

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -6040,37 +5921,37 @@ msgstr "Rozšírené info objektov" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Zadajte súradnice nového bodu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Použite desatinné stupne." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Záporné hodnoty znamenajú západnú, resp. južnú pologuľu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Prosím vložte platnú zemepisnú šírku v rozsahu -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Prosím vložte zemepisnú šírku v rozsahu -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Prosím vložte platnú zemepisnú dĺžku v rozsahu -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Prosím vložte zemepisnú dĺžku v rozsahu -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Zatvorte dialóg a vytvorte nový bod" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Zatvorte dialóg, nevytvorte nový bod" @@ -6130,5 +6011,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relácie" @@ -6176,10 +6057,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "Stiahnuť neúplných členov vybratých relácií" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "Stiahnuť neúplných členov" @@ -6243,14 +6124,14 @@ msgstr "Sel.: Rel.:{0} / Cesty:{1} / Body:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Výber: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "Získať podrobné informácie o vnútornom stave objektov." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "Prezrieť" @@ -6971,8 +6852,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6997,6 +6886,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7379,69 +7266,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Názov" @@ -8069,5 +7957,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8748,8 +8636,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Typ" @@ -8778,6 +8666,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "neznámy" @@ -9130,5 +9018,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Objavené konflikty" @@ -9710,4 +9598,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -10269,5 +10158,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Popis" @@ -10320,5 +10209,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10397,23 +10286,23 @@ "ich času boli vynechané." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Údajová vrstva {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "mimo ukladanej oblasti" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "verzia {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 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" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10423,48 +10312,11 @@ msgstr[2] "Bolo tam zistených {0} konfliktov." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -"{0} konflikt bol vyriešený automaticky vyčistením {0} " -"objektu
z miestnej dátovej sady, pretože bol zmazaný na servery." -msgstr[1] "" -"{0} konflikt bol vyriešený automaticky vyčistením {0} " -"objektov
z miestnej dátovej sady, pretože bol zmazaný na servery." -msgstr[2] "" -"{0} konflikt bol vyriešený automaticky vyčistením {0} " -"objektov
z miestnej dátovej sady, pretože bol zmazaný na servery." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"{0} zvyšok konfliktu musí byť vyriešený.

Prosím otvorte Conflict List " -"Dialog a manuálne ho vyriešte." -msgstr[1] "" -"{0} zvyšky konfliktov musia byť vyriešené.

Prosím otvorte Conflict " -"List Dialog a manuálne ich vyriešte." -msgstr[2] "" -"{0} zvyšov konfliktov musí byť vyriešených.

Prosím otvorte Conflict " -"List Dialog a manuálne ich vyriešte." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "Kliknutím zavriete tento dialóga pokračujete v editovaní" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10474,32 +10326,32 @@ msgstr[2] "{0} vymazaných" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} se skladá z:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "neuršený (unset)" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "Verzia API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Previesť do GPX vrstvy" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "Test konzistencie dátovej sady" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "Nezistený žiadny problém" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "Bol najdený nasledujúci problém:" @@ -13678,4 +13530,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -15307,5 +15160,5 @@ "

Chybová správa je:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15599,5 +15452,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Interpolácia adries" @@ -16032,36 +15885,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "multipolygón" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "adresa" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Vytvoriť novú reláciu" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Budovy, stavby" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Číslo" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Nasledujúci" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Ulica" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Adresy" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -16231,12 +16085,16 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" "Vypnuté orezávanie obrázkov pri určovaní zemepisnej polohy (georeferencingu)." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." msgstr "Zvoľte najprv WMS vrstvu v zozname." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." +msgstr "" #. item "Man Made/Pipeline" combo "Type" @@ -16290,7 +16148,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -16299,13 +16157,13 @@ msgstr "voda" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "symbol" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "parcela" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "číslo parcely" @@ -16353,32 +16211,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "adresa" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "lokalita" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "kraj" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "obec" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Povoliť automatické cachovanie." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Maximálna veľkost cache (v MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16395,18 +16253,18 @@ "
predtým, ako nahráte nejaké dáta vytvorené týmto pluginom." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "French cadastre WMS (Francúzsky kataster WMS)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "Hodnota kľúča \"zdroj\" keď je automatický zdroj zapnutý" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Zdroj" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16416,5 +16274,5 @@ "JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16424,128 +16282,128 @@ "pre texty na tmavých pozadiach." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Povoliť vyrovnanie viacnásobných vrstiev" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "Nastaviť priehľadnosť WMS vrstiev" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Kresliť obdĺžnik okolo sťahovaných dát z WMS servera." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "Rozlíšenie obrázku:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "Vysoké rozlíšenie (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "Vysoké rozlíšenie (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "Nízke rozlíšenie (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "Obrázkový filter interpolácie:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Najbližší-Sused (najrýchlejší) [ Default ]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "Bilineárne (rýchle)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "Bikubicky (pomalé)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "Zachytávač vektorových obrázkov multiplikátor:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "Zachytiť obrázok celej obrazovky" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" "Zachytávanie menších obrázkov ( vyššia kvalita, ale použije viac pamäte)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "Pevná veľkosť štvorcov (východzia 100m)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Pevná veľkosť v rozmedzí (od 25 do 1000 metrov)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "Vrstvy:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "Pozri, rieky, bazény." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "Budovy, kryty, podzemné stavby" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "Symboly ako kríže." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "Parcely." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "Čísla parciel, mená ulíc." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "Adresy, čísla domov." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "Oblasť, osada, miesto." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "Katastrálne(Fr) sekcie a podsekcie" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "Obecné administratívne hranice" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "Zachytávač rastrových obrázkov multiplikátor:" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "Zobraziť kríže:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Staré súbory sú automaticky zmazané, keď táto veľkosť je prekročená" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16554,4 +16412,8 @@ "Automaticky vyberie prvú WMS vrstvu, ak existuje viac vrstiev pri zachytávaní" "(grabovaní)." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 @@ -16877,5 +16739,5 @@ msgstr "Hranice obce bbox: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -16886,9 +16748,9 @@ "Vytvorte nový súbor." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Cache chýb formátov" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" @@ -16897,5 +16759,5 @@ "Lambertova zónou {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "Cache chýb v Lambert Zóne" @@ -18182,4 +18044,26 @@ msgstr "Ťahať na mierku obrázku v osi Y" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +#, fuzzy +msgid "Create Stops from GTFS ..." +msgstr "Vytváranie zastávok z GPX ..." + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +#, fuzzy +msgid "Create Stops from a GTFS file" +msgstr "Vytvorenie zastávok z GPX súboru" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "IOVýnimka \"{0}\" nastala" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +#, fuzzy +msgid "GTFS-Stops" +msgstr "Zastávky" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -18221,9 +18105,4 @@ msgid "Create Stops from a GPX file" msgstr "Vytvorenie zastávok z GPX súboru" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" -msgstr "IOVýnimka \"{0}\" nastala" #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83 @@ -19820,5 +19699,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Iné" @@ -20009,5 +19888,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "multipolygón" @@ -20538,5 +20417,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "oblasť (plocha)" @@ -20580,34 +20459,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Žiadne dáta" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -20630,7 +20512,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Neotagované(neoznačené) cesty" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -21461,7 +21342,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:23 -#, fuzzy msgid "Abort file chooser dialog" -msgstr "Prerušte úpravy a zatvorte dialógové okno" +msgstr "" #. Strings in JFileChooser @@ -21573,7 +21453,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Prosím vyberte súbor" +msgstr "" #. Strings in JFileChooser @@ -21884,7 +21763,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -21895,10 +21781,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Určuje trasové schopnosti" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21907,5 +21793,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21916,15 +21802,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Povoľuje pridávanie značiek/bodov na aktuálnu gps pozíciu." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 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." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21937,10 +21823,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "Vytvára radové domy mimo jednotlivých blokov." #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21949,5 +21835,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21958,5 +21844,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21965,10 +21851,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21980,5 +21866,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21988,5 +21874,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21997,5 +21883,5 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" @@ -22003,10 +21889,10 @@ #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "Vyberte poradie nerozvetvených spojených ciest" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -22017,5 +21903,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -22150,5 +22036,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Ref. číslo" @@ -22687,5 +22573,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "kov" @@ -22698,5 +22584,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "drevo (wood)" @@ -23001,8 +22887,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "áno" @@ -23113,8 +22999,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "nie" @@ -23420,5 +23306,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "obslužná (service)" @@ -23538,5 +23424,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "turistika" @@ -23685,4 +23571,9 @@ msgid "Edit Motorway Junction" msgstr "Upraviť diaľničnú križovatku" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Číslo" #. item "Waypoints/Motorway Junction" text "Number" @@ -23735,13 +23626,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operátor" @@ -24010,6 +23901,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Nadmorská výška" @@ -24867,5 +24758,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Napätie" @@ -25237,24 +25128,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Otváracia doba" @@ -25321,23 +25212,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24/7" @@ -25351,23 +25242,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "Po-Pi 08:30-20:00" @@ -25381,23 +25272,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Ut-Ne 08:00-15:00; So 08:00-12:00" @@ -25511,6 +25402,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Referenčné číslo" @@ -25526,5 +25417,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "podzemie" @@ -25538,5 +25429,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Poplatok" @@ -25712,5 +25603,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Invalidný vozík" @@ -25748,5 +25639,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Prístrešok" @@ -25754,5 +25645,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Lavička" @@ -25871,5 +25762,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Signál (rádiomaják)" @@ -26608,5 +26499,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Športy" @@ -26681,5 +26572,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -26793,12 +26732,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26865,12 +26796,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -26884,12 +26807,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -27051,5 +26966,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "šport" @@ -27076,4 +26992,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "australian_football" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "australian_football" @@ -27102,4 +27024,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "australian_football" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "kanoe" @@ -27145,6 +27073,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "americký futbal" +#, fuzzy +msgid "gaelic_football" +msgstr "australian_football" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27185,5 +27114,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "ragby" @@ -27304,6 +27239,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -27317,5 +27256,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -27337,4 +27275,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "typ" @@ -27358,6 +27298,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -27370,5 +27314,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -27390,4 +27333,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "hracia plocha, ihrisko" @@ -27410,4 +27355,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "športové centrum" @@ -27430,4 +27377,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "štadión" @@ -27450,4 +27399,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "stopa" @@ -27649,158 +27600,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Americký futbal" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Upraviť americký futbal" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Australian Football" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Upraviť Australian Football" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Australian Football" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Upraviť Australian Football" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Upraviť americký futbal" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Upraviť Australian Football" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Upraviť americký futbal" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Upraviť americký futbal" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Upraviť ragby" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Ragby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Upraviť ragby" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Bejzbal" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Upraviť bejzbal" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Basketbal" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Upraviť basketbal" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Upraviť golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "golfové ihrisko" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Bowling na tráve" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Upraviť bowling na tráve" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Bowling" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Upraviť bowling" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Kriket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Upraviť kriket" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Cvičné ihrisko pre kriket so sieťou" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Upraviť cvičné ihrisko pre kriket so sieťou" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Croquet" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Upraviť kroquet" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hokej" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Upraviť hokej" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Upraviť polotu" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Racquetbal" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Upraviť racquetbal" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Ragby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Upraviť ragby" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Stolný tenis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Upraviť stolný tenis" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tenis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Upraviť tenis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Človekom-Vytvorené (Man-Made)" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Budova" @@ -27808,5 +27795,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Verejná budova" @@ -27814,10 +27801,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Upraviť verejnú budovu" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Radnica (obecný úrad)" @@ -27825,10 +27812,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Upraviť radnicu (obecný úrad)" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Veľvyslanectvo" @@ -27836,10 +27823,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Upraviť veľvyslanectvo" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Súd" @@ -27848,10 +27835,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Upraviť súd" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Vezenie" @@ -27860,10 +27847,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Upraviť súd" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Polícia" @@ -27873,10 +27860,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Upraviť políciu" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Hasičská stanica" @@ -27885,10 +27872,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Upraviť hasičskú stanicu" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Pošta" @@ -27896,5 +27883,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Upraviť poštu" @@ -27902,15 +27889,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Škôlka" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Upraviť škôlku" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Škola" @@ -27918,10 +27905,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Upraviť školu" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Univerzita" @@ -27929,10 +27916,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Upraviť Univerzitu" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Vysoká škola" @@ -27940,5 +27927,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Upraviť vysokú školu" @@ -27946,5 +27933,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Kino" @@ -27953,10 +27940,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Upraviť kino" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Knižnica" @@ -27965,9 +27952,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Upraviť knižnicu" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Kultúrne stredisko" @@ -27975,10 +27962,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Upraviť kultúrne stredisko" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Divadlo" @@ -27987,10 +27974,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Upraviť divadlo" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Kostol" @@ -28000,5 +27987,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Upraviť kostol" @@ -28007,6 +27994,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Náboženstvo" @@ -28015,66 +28002,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "baháisti" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "budhisti" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "kresťania" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hinduisti" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "džinisti" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "judaisti" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "moslimovia" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "spiritualisti" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoisti" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "unitársky" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zoroastrian" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Vyznanie (cirkevné)" @@ -28083,81 +28070,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglikánska" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptistická" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "katolícka" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "evanjelikánska" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "svedkovia jehovovi" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "lutheránska" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "methodistická" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormónska" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "orthodoxná" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "presbiteriánska" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestanská" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "quakerská" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "šiítska" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "sunnitská" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Adresy" @@ -28166,5 +28153,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Upraviť informácie o adrese" @@ -28172,5 +28159,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Číslo domu" @@ -28178,25 +28165,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Meno domu" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Názov ulice" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Názov mesta" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Poštové smerovacie číslo" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Kód krajiny" @@ -28205,5 +28192,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Upraviť interpoláciu adries" @@ -28211,61 +28198,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Schéma číslovania" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "nepárne" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "párne" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "abecedný" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Človekom vytvorené (Man made)" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Závody (továrne)" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Upraviť závody (továrne)" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Veža" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Upraviť vežu" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "Typ veže" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "telekomunikačná" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "pozorovateľňa" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Výška (metre)" @@ -28273,25 +28260,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Vodojem" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Upraviť vodojem" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Plynojem (Gasometer)" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Upraviť plynojem (gasometer)" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Maják" @@ -28299,10 +28286,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Upraviť maják" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Veterný mlyn" @@ -28310,10 +28297,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Upraviť veterný mlyn" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Potrubie" @@ -28322,41 +28309,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Upraviť potrubie" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "plynová" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "teplo(heat)" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "ropa(oil)" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "splašky(sewage)" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "nejaké látky(any substance)" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Umiestnenie" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "podvodné(underwater)" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "nadzemné(overground)" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Čistička odpadových vôd" @@ -28366,10 +28353,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Upraviť čističku odpadových vôd" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Žeriav" @@ -28377,5 +28364,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Upraviť žeriav" @@ -28383,10 +28370,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Upraviť signál (rádiomaják)" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Meračský bod" @@ -28394,10 +28381,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Upraviť meračský bod" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Pozorovanie (ostraha)" @@ -28405,23 +28392,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Upraviť pozorovaciu kameru" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "vnútorný" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "vonkajší" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "verejný" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Elektráreň (spôsob vyroby)" @@ -28431,35 +28418,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Upraviť elektráreň (spôsob vyroby)" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "veterná" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "vodná" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fosílna" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "jadrová" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "uhoľná" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "fotovoltanická (slnečná články)" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Transformátorová stanica" @@ -28468,10 +28455,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Upraviť trafostanicu" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Malý transformátor" @@ -28480,5 +28467,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Upraviť malý transformátor" @@ -28486,10 +28473,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "Odkazová linka" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Elektrický stožiar (vysoké napätie)" @@ -28500,23 +28487,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Upraviť elektrický stožiar" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "veža" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "stožiar(pole)" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "Nastavenie veže" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Elektrické vedenie" @@ -28525,74 +28512,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Upraviť elektrické vedenie" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Typ vedenia" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "vedenie" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "vedľajšie_vedenie" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Počet káblov" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Počet vodičov (lepší: vodič) pre napájacie káble" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "jedno" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "dvojité" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "trojité" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "štvorité" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Vybavenosť (Amenities)" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Toalety" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "omedzený" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Poznámka" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Poštová schránka" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telefón" @@ -28601,5 +28588,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Upraviť telefón" @@ -28607,5 +28594,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Mince" @@ -28613,5 +28600,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Bankovky" @@ -28619,5 +28606,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Platobné karty a Kreditné karty" @@ -28625,5 +28612,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Debetné karty" @@ -28631,15 +28618,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Kreditné karty" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Telefónne karty" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Recyklácia" @@ -28648,5 +28635,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Upraviť recykláciu (zber)" @@ -28654,35 +28641,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Batérie" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Plechovky" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Handry" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Sklo" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Papier" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Železný šrot" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "Odpadkový kôš" @@ -28690,5 +28677,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Upraviť odpadkový kôš" @@ -28697,31 +28684,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "Oreradlo chrbta (Backrest)" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Materiál" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "kameň" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "plast" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Farba" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "čierna" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "hnedá" @@ -28800,5 +28787,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -28808,31 +28795,31 @@ msgstr "zelená" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "červená" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "modrá" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "šedá" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "biela" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Počet sedadiel" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Poľovnícky posed" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Upraviť poľovnícky posed" @@ -28841,30 +28828,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Výška" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "nízky" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "polovičný" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "úplný" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Skryť" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Zamknúť" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Fontána" @@ -28873,10 +28860,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Upraviť fontánu" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Pitná voda" @@ -28885,10 +28872,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Upraviť pitnú vodu" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Hydrant" @@ -28897,5 +28884,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Upraviť hydrant" @@ -28903,5 +28890,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Hniezdo záchrany" @@ -28909,15 +28896,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Upraviť hniezdo záchrany" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Obchody" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Obchod s autami" @@ -28925,10 +28912,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Upraviť obchod s autami" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Bicyklový obchod" @@ -28937,28 +28924,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Upraviť bicyklový obchod" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Upraviť supermarket" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Lekáreň" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Upraviť lekáreň" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Obchod s polotovarmi" @@ -28966,9 +28953,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Upraviť obchod s polotovarmi" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Stánok" @@ -28976,27 +28963,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Upraviť stánok" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Kníhkupectvo" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Upraviť kníhkupectvo" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Cestovná kancelária" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Upraviť cestovnú kanceláciu" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Mäsiareň" @@ -29004,9 +28991,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Upraviť mäsiarstvo" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Chlieb a pečivo" @@ -29014,9 +29001,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Upraviť chlieb a pečivo" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Kvetinárstvo" @@ -29024,18 +29011,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Upraviť kvetinárstvo" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Biopotraviny" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Upraviť biopotraviny" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Alkohol" @@ -29043,54 +29030,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Upraviť Obchod s alkoholickými nápojmi" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Nápoje" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Upraviť Obchod s nápojmi." -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Počítač" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Upraviť počítačový obchod" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Elektronika" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Upraviť obchod s elektronikou" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Upraviť obchod s Hifi elektronikou" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Nábytok" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Upraviť obchod s nábytkom" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Záhradné centrum" @@ -29098,9 +29085,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Upraviť záhradné centrum" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Železiarstvo" @@ -29108,9 +29095,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Upraviť železiarstvo" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Obchod Urob si sám" @@ -29118,54 +29105,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Upraviť obchod Urob si sám" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Papierníctvo" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Upraviť papierníctvo" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Kaderníctvo" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Upraviť kaderníctvo" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Obuva" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Upravit obchod s obuvou" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Hračky" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Upraviť obchod s hračkami" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Obchod s DVD" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Upraviť obchod s DVD" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Chemická čistiareň" @@ -29173,9 +29160,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Upraviť chemickú čistiareň" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Práčovňa" @@ -29183,9 +29170,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Upraviť práčovňu" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Turistický (Outdoor)" @@ -29193,24 +29180,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Upraviť športový obchod" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Optik" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Upraviť očnú optiku" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Predajný automat" @@ -29218,5 +29205,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Upraviť predajný automat" @@ -29224,97 +29211,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Predávané výrobky" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "lístky MHD" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "plány MHD" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "parkovacie lístky" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "jedlo" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "pitie" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "sladkosti" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "cigarety" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "fotky" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "krmivo pre zvieratá" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "noviny" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "hračky" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "známky" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-karty" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "telefónne kupóny (poukážky)" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "kupóny (poukážky)" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "kondómy" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tampóny" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "sáčky na výkaly" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "Prístupové alebo vernostné karty" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Hotovosť" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Banka" @@ -29322,14 +29309,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Upraviť banku" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Zmenáreň" @@ -29337,5 +29324,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Upraviť zmenáreň" @@ -29343,15 +29330,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Upraviť bankomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Zdravie" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Lekári" @@ -29359,18 +29346,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Upraviť lekárov" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Zubný lekár" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Upraviť zubného lekára" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Lekáreň" @@ -29378,5 +29365,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Upraviť lekáreň" @@ -29384,9 +29371,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "výdaj na recepty" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Nemocnica" @@ -29394,10 +29381,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Upraviť nemocnicu" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Pohotovosť (Záchranná služba)" @@ -29406,5 +29393,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Upraviť pohotovosť (záchrannú službu)" @@ -29413,20 +29400,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Číslo bodu" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Meno bodu(miesta)" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Telefónne číslo" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Použite medzinárodný kód, ako +12-345-67890)" @@ -29434,5 +29421,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Veterinár" @@ -29441,64 +29428,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Upraviť veterinárnu ambulanciu" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Geografia(Zemepis)" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Miesta" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Upraviť kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Krajina (štát)" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Upraviť krajinu (štát)" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Stav" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Upraviť štát" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Oblasť (región)" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Upraviť oblasť (región)" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "kraj (okres)" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Upraviť kraj (okres)" @@ -29506,15 +29493,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Mesto (city)" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Upraviť mesto" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Mesto (town)" @@ -29522,10 +29509,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Upraviť mesto" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Štvrť" @@ -29533,25 +29520,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Upraviť štvrť" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Dedina" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Upraviť dedinu" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Malá dedina / osada / samota" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Upraviť malú dedinu" @@ -29559,5 +29546,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Oblasť (lokalita)" @@ -29565,10 +29552,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Upraviť oblasť (lokalitu)" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Ostrov" @@ -29576,10 +29563,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Upraviť Ostrov" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Ostrovček" @@ -29587,5 +29574,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Upraviť ostrovček" @@ -29593,5 +29580,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Vstup do jaskyne" @@ -29599,10 +29586,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Upraviť vstup do jaskyne" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Vrchol" @@ -29610,10 +29597,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Upraviť vrchol kopca" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Ľadovec" @@ -29621,10 +29608,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Upraviť ľadovec" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Sopka" @@ -29632,70 +29619,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Upraviť sopku" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Hranice" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Štátna" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Upraviť štátne hranice" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Administratívne" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Upraviť administratívne hranice" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Občianske" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Upraviť občiansku hranicu" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Politická" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Upraviť politickú hranicu" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Národný park" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Upraviť hranicu Národného parku (prírodnej rezervácie)" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Využívanie oblasti (Land use)" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Strom" @@ -29704,15 +29691,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Upraviť strom" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Botanický názov" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Drevo" @@ -29721,5 +29708,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Upraviť Drevo" @@ -29727,17 +29714,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "ihličnatý" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "listnatý" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "zmiešaný" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Les" @@ -29746,14 +29733,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Upraviť les" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Prírodná rezervácia" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Upraviť prírodnú rezerváciu" @@ -29761,25 +29748,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Sutina" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Upraviť sutinu" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Krovie" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Upraviť krovie" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))" @@ -29787,5 +29774,5 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "" @@ -29793,5 +29780,5 @@ #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Vresovisko" @@ -29799,5 +29786,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Upraviť vresovisko" @@ -29805,5 +29792,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Farma" @@ -29812,45 +29799,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Upraviť farmu" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Poľnohospodárska pôda" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Upraviť poľnohospodárske pôdu" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Lúka" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Upraviť lúku" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Vinica" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Upraviť vinicu" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Ťažobný priestor" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Upraviť ťažobný priestor" @@ -29858,25 +29845,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Záhrada" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Upraviť záhradu" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Tráva" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Upraviť trávnatú plochu" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Obecná zeleň" @@ -29884,10 +29871,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Upraviť obecnú zeleň" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Spoločné, obecné" @@ -29895,20 +29882,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Upraviť spoločné, obecné" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Upraviť park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Rekreačná oblasť" @@ -29916,5 +29903,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Upraviť rekreačnú oblasť" @@ -29922,15 +29909,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Osídlená oblasť (Residential area)" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Upraviť osídlenú oblasť" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Cintorín (malý, blizko kostola)" @@ -29938,9 +29925,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Upraviť cintorín (malý, blizko kostola)" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Cintorín" @@ -29948,39 +29935,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Upraviť cintorín" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Maloobchod" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Upraviť oblasť s maloobchodmi" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Obchodná (komerčná)" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Upraviť obchodnú (komerčnú) oblasť" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Priemysel" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Upraviť priemyselnú oblasť" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Železničný pozemok" @@ -29988,15 +29975,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Upraviť železničný pozemok" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Armáda" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Upraviť vojenskú oblasť" @@ -30004,50 +29991,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Stavebná oblasť" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Upraviť stavebnú oblasť" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Brownfield (opustený priemyselný objekt)" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Upraviť brownfield (opustený priemyselný objekt)" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Skládka odpadov" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Upraviť skládku odpadov" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Lom" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Upraviť lom" @@ -30057,5 +30044,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Upraviť multipolygón" @@ -30067,5 +30054,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "obvodová časť (outer segment)" @@ -30073,5 +30060,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "vnútorná časť (inner segment)" @@ -30079,5 +30066,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -30088,5 +30075,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -30094,36 +30081,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -30131,5 +30118,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Prikázané smery jazdy (turn restriction)" @@ -30138,5 +30125,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Upraviť prikázané smery jazdy (turn restriction)" @@ -30144,34 +30131,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Obmedzenie" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "zákaz zabočenia vľavo" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "zákaz zabočenia vpravo" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "zákaz jazdy priamo" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "zákaz otáčania sa" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "prikázané odbočenie vpravo" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "prikázané odbočenie vľavo" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "zákaz odbočenia" @@ -30180,15 +30167,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "z cesty" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "cez bod alebo cestu" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "k ceste" @@ -30196,5 +30183,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Cesta (Route)" @@ -30203,5 +30190,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Upraviť Cestu (Route)" @@ -30209,5 +30196,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Typ Cesty (Route)" @@ -30315,5 +30302,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -30324,17 +30311,17 @@ msgstr "bicykel" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "autobus" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "cesta (vozovka)" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "trajekt (prievoz)" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "lyžovanie" @@ -30402,5 +30389,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -30410,9 +30397,9 @@ msgstr "pešia (foot)" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "električka" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "obchádzka" @@ -30426,10 +30413,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "metro (subway)" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Popis značky" @@ -30437,31 +30424,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Sieť" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "Štátna cesta" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "plánovaný" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "náhradný" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "dočasný" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "spojenie" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Farba (hex)" @@ -30470,30 +30457,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "cestný úsek" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "predný segment" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "zadný segment" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "bod prerušenia" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "predný bod prerušenia" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "zadný bod prerušenia" @@ -30720,5 +30707,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "zastaralý" @@ -34046,11 +34033,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "miesto" @@ -34064,5 +34051,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" @@ -34417,4 +34404,139 @@ msgid "Sicily - Italy" msgstr "Sicily - Italy" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "Nastala chyba počas komunikácie so serverom
Detaily: {0}" + +#~ msgid "Communication with server failed" +#~ msgstr "Spojenie so serverom zlyhalo" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Áno, obnoviť ich tiež" + +#~ msgid "No, cancel operation" +#~ msgstr "Nie, zrušiť operáciu" + +#~ msgid "" +#~ "There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgid_plural "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" +#~ msgstr[0] "" +#~ "Nachádza sa tam {0} ďalší bod použitý v ceste {1}
ktorý je vymazaný na " +#~ "servery.

Chcete obnoviť tento bod tiež?" +#~ msgstr[1] "" +#~ "Nachádza sa tam {0} ďalších bodov použitých v ceste {1}
ktoré sú " +#~ "vymazané na servery.

Chcete obnoviť tieto body tiež?" +#~ msgstr[2] "" +#~ "Nachádzajú sa tam {0} ďalšie body použité v ceste {1}
ktoré sú " +#~ "vymazané na servery.

Chcete obnoviť tieto body tiež?" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Obnoviť pridané body?" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "Nachádza sa tam {0} ďalší pôvodný odkazujúci na reláciu {1}
ktorý je " +#~ "vymazaný na servery.

Chcete obnoviť tento bod tiež?" +#~ msgstr[1] "" +#~ "Nachádza sa tam {0} ďalších pôvodných odkazujúcich na reláciu {1}" +#~ "
ktoré sú vymazané na servery.

Chcete obnoviť tieto body tiež?" +#~ msgstr[2] "" +#~ "Nachádzajú sa tam {0} ďalšie pôvodné odkazujúce na reláciu {1}
ktoré " +#~ "sú vymazané na servery.

Chcete obnoviť tieto body tiež?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Obnoviť pôvodné závislé odkazy?" + +#~ msgid "Visible State:" +#~ msgstr "Viditeľný Stav:" + +#~ msgid "visible (on the server)" +#~ msgstr "viditeľné (na servery)" + +#~ msgid "not visible (on the server)" +#~ msgstr "neviditeľné (na servery)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Zostáva klon lokálnej verzie" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Fyzicky vymazať z lokálnej verzie" + +#~ msgid "Keep my visible state" +#~ msgstr "Zostáva môj viditeľný stav" + +#~ msgid "Yes, reset the id" +#~ msgstr "Áno, vynulovať id" + +#~ msgid "Reset id to 0" +#~ msgstr "Nastaviť id na 0" + +#~ msgid "Keep their visible state" +#~ msgstr "Ponechať svoj viditeľný stav" + +#~ msgid "Yes, purge it" +#~ msgstr "Áno, očistiť to" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM odstráni vaše lokálne pôvodné s id {0}
z dátovej sady." +#~ "
Súhlasíte?" + +#~ msgid "Remove from dataset" +#~ msgstr "Odstrániť z dátovej sady" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Nerozhodnutý konflikt medzi viditeľnými stavom" + +#~ msgid "" +#~ "{0} conflict has been resolved automatically by purging " +#~ "{0} object
from the local dataset because it is deleted on the server." +#~ msgid_plural "" +#~ "{0} conflicts have been resolved automatically by " +#~ "purging {0} objects
from the local dataset because they are deleted " +#~ "on the server." +#~ msgstr[0] "" +#~ "{0} konflikt bol vyriešený automaticky vyčistením {0} " +#~ "objektu
z miestnej dátovej sady, pretože bol zmazaný na servery." +#~ msgstr[1] "" +#~ "{0} konflikt bol vyriešený automaticky vyčistením {0} " +#~ "objektov
z miestnej dátovej sady, pretože bol zmazaný na servery." +#~ msgstr[2] "" +#~ "{0} konflikt bol vyriešený automaticky vyčistením {0} " +#~ "objektov
z miestnej dátovej sady, pretože bol zmazaný na servery." + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "{0} zvyšok konfliktu musí byť vyriešený.

Prosím otvorte Conflict " +#~ "List Dialog a manuálne ho vyriešte." +#~ msgstr[1] "" +#~ "{0} zvyšky konfliktov musia byť vyriešené.

Prosím otvorte Conflict " +#~ "List Dialog a manuálne ich vyriešte." +#~ msgstr[2] "" +#~ "{0} zvyšov konfliktov musí byť vyriešených.

Prosím otvorte " +#~ "Conflict List Dialog a manuálne ich vyriešte." + +#~ msgid "football" +#~ msgstr "americký futbal" + +#~ msgid "Football" +#~ msgstr "Americký futbal" #~ msgid "Move" Index: /applications/editors/josm/i18n/po/sl.po =================================================================== --- /applications/editors/josm/i18n/po/sl.po (revision 22208) +++ /applications/editors/josm/i18n/po/sl.po (revision 22209) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-23 21:49+0000\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-28 15:54+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Slovenian \n" @@ -17,5 +17,5 @@ "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: 2010-06-28 14:51+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:08+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -28,5 +28,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -70,5 +70,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -78,5 +78,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -238,5 +238,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -244,6 +244,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -329,8 +329,7 @@ msgstr "" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Dodaj vozlišče..." @@ -648,5 +647,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1027,5 +1026,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1034,5 +1033,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1169,4 +1168,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "" @@ -1440,6 +1440,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1657,6 +1657,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2277,5 +2275,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2511,10 +2509,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Išči..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Iskanje predmetov." @@ -2522,65 +2520,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Prosim, vnesite iskalni izraz." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "nadomesti izbor" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "dodaj v izbor" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "odstrani iz izbora" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "upoštevaj velikost črk" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "regularni izraz" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2588,38 +2586,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2627,5 +2625,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2633,5 +2631,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2639,5 +2637,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2645,9 +2643,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2655,39 +2653,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2695,12 +2693,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2709,38 +2707,51 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Iskanje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Začni iskanje" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "regularni izraz" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Z iskanjem ''{0}'' ni bilo iz izbora odstranjeno ničesar" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2748,5 +2759,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2754,5 +2765,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2760,5 +2771,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2766,5 +2777,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2885,8 +2896,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3025,5 +3036,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3147,11 +3158,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3160,5 +3171,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3167,5 +3178,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3203,5 +3214,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3510,6 +3521,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3519,10 +3530,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3530,5 +3541,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3537,5 +3548,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3543,78 +3554,4 @@ #, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "besedilo" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -3752,5 +3689,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "ozadje" @@ -3920,5 +3857,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "železnica" @@ -3939,7 +3876,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4008,7 +3945,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "zgradba" @@ -4099,5 +4036,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4314,5 +4251,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4611,12 +4548,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Lastnosti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4627,6 +4564,6 @@ msgstr "Oznake" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4634,6 +4571,6 @@ msgstr "Vozlišča" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4641,9 +4578,9 @@ msgstr "Člani" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4652,5 +4589,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4659,26 +4596,26 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4686,25 +4623,25 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Odpravljanje sporov" @@ -4750,5 +4687,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "" @@ -4759,5 +4696,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4771,5 +4708,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "" @@ -4838,5 +4775,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4848,5 +4785,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Dol" @@ -4945,60 +4882,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5006,123 +4892,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "izbrisano" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" msgstr "" @@ -5270,5 +5091,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "" @@ -5348,7 +5169,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5358,6 +5179,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5543,5 +5364,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5597,25 +5418,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5627,22 +5448,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5655,43 +5476,122 @@ msgstr "Dodaj" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 +msgid "Enable filter" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 +msgid "Hide elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 -msgid "Enable filter" +msgid "Inverse filter" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 -msgid "Hide elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 -msgid "Inverse filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 msgid "Filter mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Napaka v datoteki {0}" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "besedilo" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5734,37 +5634,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Vpišite koordinate novega vozlišča." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Uporabi decimalne stopinje." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negativne vrednosti pomenijo zahodno/južno poloblo." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "" @@ -5824,5 +5724,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relacije" @@ -5870,10 +5770,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -5937,14 +5837,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6645,8 +6545,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6671,6 +6579,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7053,69 +6959,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Naziv" @@ -7697,5 +7604,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8334,8 +8241,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Vrsta" @@ -8364,6 +8271,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "neznan" @@ -8684,5 +8591,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "" @@ -9200,4 +9107,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9697,5 +9605,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Opis" @@ -9744,5 +9652,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -9817,23 +9725,23 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "izven sprejetega področja" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9842,34 +9750,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -9878,32 +9763,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} je sestavljen iz:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Pretvori v plast GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -12821,4 +12706,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14274,5 +14160,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14534,5 +14420,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Interpolacija naslovov" @@ -14966,36 +14852,35 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 +msgid "on polygon" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "Naslovi" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Ustvari novo relacijo" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Zgradbe" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +msgid "Next no" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Naslovi" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15149,10 +15034,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15207,7 +15096,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15216,13 +15105,13 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15270,32 +15159,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15307,18 +15196,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15326,5 +15215,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15332,130 +15221,134 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15756,5 +15649,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -15763,14 +15656,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "" @@ -17030,4 +16923,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17068,9 +16980,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -18570,5 +18477,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Drugo" @@ -18756,5 +18663,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "" @@ -19271,5 +19178,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "" @@ -19312,34 +19219,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Ni podatkov" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -20272,7 +20182,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Odpri datoteko." +msgstr "" #. Strings in JFileChooser @@ -20554,7 +20463,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20563,10 +20479,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20575,5 +20491,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20582,15 +20498,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20600,10 +20516,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20612,5 +20528,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20619,5 +20535,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20626,10 +20542,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20638,5 +20554,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20646,5 +20562,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20653,15 +20569,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20670,5 +20586,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -20801,5 +20717,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "" @@ -21338,5 +21254,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "" @@ -21349,5 +21265,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "" @@ -21652,8 +21568,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "da" @@ -21764,8 +21680,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "" @@ -22071,5 +21987,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "" @@ -22189,5 +22105,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "" @@ -22336,4 +22252,9 @@ msgid "Edit Motorway Junction" msgstr "Uredi avtocestno križišče" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "" #. item "Waypoints/Motorway Junction" text "Number" @@ -22386,13 +22307,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "" @@ -22660,6 +22581,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "" @@ -23511,5 +23432,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "" @@ -23880,24 +23801,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "" @@ -23964,23 +23885,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "" @@ -23994,23 +23915,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "" @@ -24024,23 +23945,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -24154,6 +24075,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "" @@ -24169,5 +24090,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "" @@ -24181,5 +24102,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "" @@ -24355,5 +24276,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "" @@ -24391,5 +24312,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "" @@ -24397,5 +24318,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Klopca" @@ -24514,5 +24435,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "" @@ -25251,5 +25172,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "" @@ -25324,5 +25245,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25436,12 +25405,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25508,12 +25469,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25527,12 +25480,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -25694,5 +25639,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "šport" @@ -25719,4 +25665,9 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +msgid "american_football" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "" @@ -25744,4 +25695,9 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +msgid "canadian_football" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "" @@ -25784,5 +25740,5 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" +msgid "gaelic_football" msgstr "" @@ -25824,5 +25780,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +msgid "rugby_union" msgstr "" @@ -25943,6 +25904,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -25956,5 +25921,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -25976,4 +25940,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "vrsta" @@ -25997,6 +25963,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26009,5 +25979,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26029,4 +25998,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "" @@ -26049,4 +26020,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "" @@ -26069,4 +26042,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "stadion" @@ -26089,4 +26064,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -26288,158 +26265,190 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "" - -#. item "Sport (Ball)/Football" +msgid "Australian Football" +msgstr "" + +#. item "Sport (Ball)/Australian Football" #: build/trans_presets.java:2071 -msgid "Edit Football" +msgid "Edit Australian Football" msgstr "" #: build/trans_presets.java:2076 -msgid "Australian Football" -msgstr "" - -#. item "Sport (Ball)/Australian Football" +msgid "American Football" +msgstr "" + +#. item "Sport (Ball)/American Football" #: build/trans_presets.java:2077 -msgid "Edit Australian Football" -msgstr "" +#, fuzzy +msgid "Edit American Football" +msgstr "Uredi regionalno cesto (3. reda, turistična)" #: build/trans_presets.java:2082 +msgid "Canadian Football" +msgstr "" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Uredi kanal" + +#: build/trans_presets.java:2088 +msgid "Gaelic Football" +msgstr "" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Uredi košarko" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Uredi kamnolom" + +#: build/trans_presets.java:2100 +msgid "Rugby Union" +msgstr "" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Uredi ruševine" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Košarka" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Uredi košarko" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Uredi golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "golf_igrišče" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hokej" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Uredi hokej" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Namizni tenis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Uredi namizni tenis" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tenis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Uredi tenis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Zgradba" @@ -26447,5 +26456,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Javne zgradbe" @@ -26453,10 +26462,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Uredi javno zgradbo" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Mestna hiša" @@ -26464,10 +26473,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Uredi mestno hišo" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Veleposlaništvo" @@ -26475,10 +26484,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Uredi veleposlaništvo" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Sodišče" @@ -26487,10 +26496,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Uredi sodišče" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Zapor" @@ -26499,10 +26508,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Uredi zapor" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Policijska postaja" @@ -26512,10 +26521,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Uredi policijsko postajo" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Gasilski dom" @@ -26524,10 +26533,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Uredi gasilski dom" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Pošta" @@ -26535,5 +26544,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Uredi pošto" @@ -26541,15 +26550,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Šola" @@ -26557,10 +26566,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Uredi šolo" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "" @@ -26568,10 +26577,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "" @@ -26579,5 +26588,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "" @@ -26585,5 +26594,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Kinematograf" @@ -26592,10 +26601,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Uredi kinematograf" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Knjižnica" @@ -26604,9 +26613,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Uredi knjižnico" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "" @@ -26614,10 +26623,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Gledališče" @@ -26626,10 +26635,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Uredi gledališče" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Kraj čaščenja" @@ -26639,5 +26648,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Uredi kraj čaščenja" @@ -26646,6 +26655,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Vera" @@ -26654,66 +26663,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "" @@ -26722,81 +26731,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Naslovi" @@ -26805,5 +26814,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Urejanje podatkov o naslovu" @@ -26811,5 +26820,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "" @@ -26817,25 +26826,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Ime ceste" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Poštna številka" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "" @@ -26844,5 +26853,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Uredi interpolacijo naslovov" @@ -26850,61 +26859,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Stolp" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Uredi stolp" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "" @@ -26912,25 +26921,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Vodni stolp" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Uredi vodni stolp" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Svetilnik" @@ -26938,10 +26947,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Uredi svetilnik" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Mlin na veter" @@ -26949,10 +26958,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Uredi mlin na veter" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Cevovod" @@ -26961,41 +26970,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Uredi cevovod" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Čistilna naprava" @@ -27005,10 +27014,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Uredi čistilno napravo" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Žerjav" @@ -27016,5 +27025,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Uredi žerjav" @@ -27022,10 +27031,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Geodetska točka" @@ -27033,10 +27042,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Uredi geodetsko točko" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Video nadzor" @@ -27044,23 +27053,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Uredi video nadzorno kamero" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "" @@ -27070,35 +27079,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "" @@ -27107,10 +27116,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "" @@ -27119,5 +27128,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "" @@ -27125,10 +27134,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Steber daljnovoda" @@ -27139,23 +27148,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Uredi steber daljnovoda" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "" @@ -27164,74 +27173,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Stranišča" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Poštni nabiralnik" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telefon" @@ -27240,5 +27249,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Uredi telefon" @@ -27246,5 +27255,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Kovanci" @@ -27252,5 +27261,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Bankovci" @@ -27258,5 +27267,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "" @@ -27264,5 +27273,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Debetne kartice" @@ -27270,15 +27279,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Kreditne kartice" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Telefonske kartice" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Recikliranje" @@ -27287,5 +27296,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Uredi raciklažno točko" @@ -27293,35 +27302,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "" @@ -27329,5 +27338,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "" @@ -27336,31 +27345,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "" @@ -27439,5 +27448,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27447,31 +27456,31 @@ msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "" @@ -27480,30 +27489,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "" @@ -27512,10 +27521,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Pitna voda" @@ -27524,10 +27533,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Uredi pitno vodo" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "" @@ -27536,5 +27545,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "" @@ -27542,5 +27551,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "" @@ -27548,15 +27557,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Trgovine" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "" @@ -27564,10 +27573,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "" @@ -27576,28 +27585,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "" @@ -27605,9 +27614,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "" @@ -27615,27 +27624,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Mesar" @@ -27643,9 +27652,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Uredi mesarja" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Pekarna" @@ -27653,9 +27662,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Uredi pekarno" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "" @@ -27663,18 +27672,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "" @@ -27682,54 +27691,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "" @@ -27737,9 +27746,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "" @@ -27747,9 +27756,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Sam svoj mojster" @@ -27757,54 +27766,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Uredi sam svoj mojster trgovino" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Čistilnica" @@ -27812,9 +27821,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Uredi čistilnico" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Pralnica" @@ -27822,9 +27831,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Uredi pralnico" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "" @@ -27832,24 +27841,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Prodajni avtomat" @@ -27857,5 +27866,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Uredi prodajni avtomat" @@ -27863,97 +27872,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Prodajani izdelki" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "pijača" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM kartice" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Denar" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Banka" @@ -27961,14 +27970,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Uredi banko" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Bankomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Menjalnica" @@ -27976,5 +27985,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Uredi menjalnico" @@ -27982,15 +27991,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Uredi bankomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Zdravje" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "" @@ -27998,18 +28007,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Lekarna" @@ -28017,5 +28026,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Uredi lekarno" @@ -28023,9 +28032,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Bolnišnica" @@ -28033,10 +28042,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Uredi bolnišnico" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "" @@ -28045,5 +28054,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "" @@ -28052,20 +28061,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "" @@ -28073,5 +28082,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "" @@ -28080,64 +28089,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Kraji" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Uredi kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Država" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Uredi državo" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "" @@ -28145,15 +28154,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "" @@ -28161,10 +28170,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "" @@ -28172,25 +28181,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Vas" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Uredi vas" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Zaselek" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Uredi zaselek" @@ -28198,5 +28207,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "" @@ -28204,10 +28213,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Otok" @@ -28215,10 +28224,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Uredi otok" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "" @@ -28226,5 +28235,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "" @@ -28232,5 +28241,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "" @@ -28238,10 +28247,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Vrh" @@ -28249,10 +28258,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Uredi vrh" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "" @@ -28260,10 +28269,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "" @@ -28271,70 +28280,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Meje" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Raba tal" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Drevo" @@ -28343,15 +28352,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Uredi drevo" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "" @@ -28360,5 +28369,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "" @@ -28366,17 +28375,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Gozd" @@ -28385,14 +28394,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Uredi gozdnata tla" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Naravni rezervat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Uredi naravni rezervat" @@ -28400,25 +28409,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "" @@ -28426,10 +28435,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "" @@ -28437,5 +28446,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "" @@ -28443,5 +28452,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "" @@ -28450,45 +28459,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Vinograd" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Uredi vinograd" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "" @@ -28496,25 +28505,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "" @@ -28522,10 +28531,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "" @@ -28533,20 +28542,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "" @@ -28554,5 +28563,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -28560,15 +28569,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Pokopališče" @@ -28576,9 +28585,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Uredi pokopališče" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "" @@ -28586,39 +28595,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Ozemlje železnice" @@ -28626,15 +28635,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Uredi ozemlje železnice" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "" @@ -28642,50 +28651,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Gradbišče" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Kamnolom" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Uredi kamnolom" @@ -28695,5 +28704,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "" @@ -28705,5 +28714,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "" @@ -28711,5 +28720,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "" @@ -28717,5 +28726,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -28726,5 +28735,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -28732,36 +28741,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -28769,5 +28778,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "" @@ -28776,5 +28785,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "" @@ -28782,34 +28791,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "" @@ -28818,15 +28827,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "" @@ -28834,5 +28843,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "" @@ -28841,5 +28850,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "" @@ -28847,5 +28856,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "" @@ -28953,5 +28962,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -28962,17 +28971,17 @@ msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "" @@ -29040,5 +29049,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29048,9 +29057,9 @@ msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "" @@ -29064,10 +29073,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "" @@ -29075,31 +29084,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "" @@ -29108,30 +29117,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "" @@ -29358,5 +29367,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "" @@ -32684,11 +32693,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "" @@ -32702,5 +32711,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" Index: /applications/editors/josm/i18n/po/sv.po =================================================================== --- /applications/editors/josm/i18n/po/sv.po (revision 22208) +++ /applications/editors/josm/i18n/po/sv.po (revision 22209) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" "PO-Revision-Date: 2010-06-07 08:48+0000\n" "Last-Translator: Dirk Stöcker \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:53+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:10+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -27,5 +27,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -69,5 +69,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -77,5 +77,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -243,5 +243,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -249,6 +249,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -336,8 +336,7 @@ msgstr "Inga mål lager" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Lägg till nod..." @@ -661,5 +660,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1043,5 +1042,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1050,5 +1049,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1187,4 +1186,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Flytta nod" @@ -1472,6 +1472,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1693,6 +1693,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2328,5 +2326,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2573,10 +2571,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Sök..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Sök efter objekt." @@ -2584,49 +2582,49 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Ange filtersträng" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Ange en söksträng." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Ange sökuttryck" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "ersätt urval" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "utöka urval" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "ta bort från urval" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "sök i markering" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "gör skillnad på gemener/VERSALER" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "reguljärt uttryck" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" @@ -2634,5 +2632,5 @@ "värde som helst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" @@ -2640,13 +2638,13 @@ "värde som helst." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak - ''Bak'' var som helst i nyckeln name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - nyckel \"type\" med det exakta värdet \"route\"." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2656,21 +2654,21 @@ "type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - som inte har ''Bak'' i nyckeln name." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "oneway? - oneway=yes, true, 1 eller on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - som innehåller nyckeln foot oavsett dess värde." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Särskilda mål:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2679,17 +2677,17 @@ "relation för relation)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:... - alla objekt som ändrats av användare..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "user:anonymous - alla objekt ändrade av anonyma användare" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - objekt med angivet ID (0 för alla nya objekt)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2699,5 +2697,5 @@ "angiven version)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2707,5 +2705,5 @@ "angivet ändringsset)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2715,5 +2713,5 @@ "min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2723,9 +2721,9 @@ "max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2735,21 +2733,21 @@ "12T14:51:09Z, 2006-11-12 eller T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified - alla ändrade objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected - alla valda objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete - alla ofullständiga objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "otaggade - alla otaggede objekt" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2757,5 +2755,5 @@ "child uttryck - alla barn till objekt matchande uttrycket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2763,13 +2761,13 @@ "parent uttryck - alla föräldrar till objekt matchande uttrycket" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "Använd | eller OR för att kombinera med logiskt ELLER" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2779,12 +2777,12 @@ "b>. (Dvs. \\\" och \\\\)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Använd ( och ) för att gruppera uttryck" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2793,38 +2791,51 @@ msgstr "Filter" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Sök" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Påbörja sökning" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Ange sökuttryck" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Inga sökträffar för ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "Urvalet utökades inte genom att söka efter ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Urvalet begränsades inte genom att söka efter ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "Inget funnet i markeringen vid sökande efter \"{0}\"" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2832,5 +2843,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2838,5 +2849,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2844,5 +2855,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2850,5 +2861,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2977,8 +2988,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3117,5 +3128,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3244,11 +3255,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3257,5 +3268,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3264,5 +3275,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3300,5 +3311,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3609,6 +3620,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3618,10 +3629,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3629,5 +3640,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3636,5 +3647,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3642,78 +3653,4 @@ #, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "text" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -3845,5 +3782,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "bakgrund" @@ -4013,5 +3950,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "järnväg" @@ -4032,7 +3969,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4099,7 +4036,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "byggnad (building)" @@ -4188,5 +4125,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4409,5 +4346,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4706,12 +4643,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4722,6 +4659,6 @@ msgstr "Taggar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4729,6 +4666,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4736,9 +4673,9 @@ msgstr "Medlemmar" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4747,5 +4684,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4754,26 +4691,26 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4781,25 +4718,25 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "" @@ -4845,5 +4782,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "" @@ -4854,5 +4791,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4866,5 +4803,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "" @@ -4933,5 +4870,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4943,5 +4880,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "" @@ -5040,60 +4977,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Ja, återskapa dem också" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "Nej, avbryt" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Återskapa ytterligare noder?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5101,123 +4987,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "raderad" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" msgstr "" @@ -5365,5 +5186,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "alla" @@ -5443,7 +5264,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5453,6 +5274,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5638,5 +5459,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5693,25 +5514,25 @@ msgstr "Sätt urval av element på kartan till de valda posterna i listan ovan." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5723,22 +5544,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5751,43 +5572,122 @@ msgstr "Lägg till" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 +msgid "Enable filter" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 +msgid "Hide elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 -msgid "Enable filter" +msgid "Inverse filter" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 -msgid "Hide elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 -msgid "Inverse filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 msgid "Filter mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Fel vid läsning av fil" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "text" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5830,37 +5730,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Ange den nya nodens koordinater." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Använd decimalgrader." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negativa värden avser västra/södra halvklotet." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Vänligen välj en korrekt latitud i området -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Vänligen välj en korrekt latitud i området -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Vänligen välj en korrekt longitud i området -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Vänligen välj en korrekt longitud i området -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Stäng dialogrutan och skapa en ny nod" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Stäng dialogrutan men skapa ingen nod" @@ -5920,5 +5820,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Relationer" @@ -5966,10 +5866,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -6033,14 +5933,14 @@ msgstr "Urval: Rel.:{0}/Sträckor:{1}/Noder:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Urval: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6743,8 +6643,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6769,6 +6677,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7151,69 +7057,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Namn" @@ -7791,5 +7698,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8429,8 +8336,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Typ" @@ -8459,6 +8366,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "okänd" @@ -8779,5 +8686,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "" @@ -9300,4 +9207,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9797,5 +9705,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Beskrivning" @@ -9846,5 +9754,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -9923,23 +9831,23 @@ "kunna uppskattas med någon rimlighet uteslöts." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Datalager {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "utanför hämtat område" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9948,34 +9856,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -9984,32 +9869,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} består av:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Omvandla till gpx-lager" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -12968,4 +12853,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14426,5 +14312,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14695,5 +14581,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Adressinterpolation" @@ -15127,36 +15013,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Multipolygon" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "adress" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Skapa en ny relation" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Byggnader" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Nummer" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Nästa" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Adresser" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15310,10 +15197,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15368,7 +15259,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15377,13 +15268,13 @@ msgstr "vatten" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15431,32 +15322,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "adress" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Aktivera automatisk cachning." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Största tillåtna cachestorlek (MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15468,9 +15359,9 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "Fransk Cadastre-WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" @@ -15478,10 +15369,10 @@ "källa är aktiverat." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Källa" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15491,5 +15382,5 @@ "JOSM:s inställningar." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15499,130 +15390,134 @@ "gråtoner). Användbart för text på mörka bakgrunder." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Rita en rektangel runt data nedladdad från WMS-servern." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "Hämta mindre bilder (högre kvalitet, men mer minneskrävande)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "Äldsta filerna raderas automatiskt när denna storlek överskrids" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15923,5 +15818,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -15932,14 +15827,14 @@ "Skapa en ny." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Cacheformatsfel" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "" @@ -17219,4 +17114,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17257,9 +17171,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -18771,5 +18680,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Annat" @@ -18956,5 +18865,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Multipolygon" @@ -19484,5 +19393,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "yta (area)" @@ -19529,34 +19438,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Inga data" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19581,7 +19493,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Sträckor utan tagg" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20497,7 +20408,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Öppna en fil." +msgstr "" #. Strings in JFileChooser @@ -20781,7 +20691,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20792,10 +20709,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20804,5 +20721,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20811,15 +20728,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20829,10 +20746,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20841,5 +20758,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20848,5 +20765,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20855,10 +20772,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20867,5 +20784,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20875,5 +20792,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20882,15 +20799,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20899,5 +20816,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21030,5 +20947,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Referens" @@ -21567,5 +21484,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "" @@ -21578,5 +21495,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "skog" @@ -21881,8 +21798,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "ja" @@ -21993,8 +21910,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "nej" @@ -22300,5 +22217,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "tillfartsväg" @@ -22418,5 +22335,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "" @@ -22565,4 +22482,9 @@ msgid "Edit Motorway Junction" msgstr "Redigera en motorvägskorsning" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Nummer" #. item "Waypoints/Motorway Junction" text "Number" @@ -22615,13 +22537,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operatör" @@ -22889,6 +22811,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Höjd" @@ -23740,5 +23662,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Spänning" @@ -24109,24 +24031,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Öppettider" @@ -24193,23 +24115,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "" @@ -24223,23 +24145,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "" @@ -24253,23 +24175,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -24383,6 +24305,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Referensnummer" @@ -24398,5 +24320,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "underjordisk" @@ -24410,5 +24332,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Avgift" @@ -24584,5 +24506,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "Rullstol" @@ -24620,5 +24542,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Vindskydd" @@ -24626,5 +24548,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Bänk" @@ -24743,5 +24665,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Fyrbåk" @@ -25480,5 +25402,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Idrott" @@ -25553,5 +25475,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25665,12 +25635,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25737,12 +25699,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25756,12 +25710,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -25923,5 +25869,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "sport" @@ -25948,4 +25895,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "australisk fotboll" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "australisk fotboll" @@ -25973,4 +25926,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "australisk fotboll" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "kanot" @@ -26013,6 +25972,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "amerikansk fotboll" +#, fuzzy +msgid "gaelic_football" +msgstr "australisk fotboll" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26053,5 +26013,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "rugby" @@ -26172,6 +26138,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26185,5 +26155,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26205,4 +26174,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "typ" @@ -26226,6 +26197,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26238,5 +26213,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26258,4 +26232,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "plan" @@ -26278,4 +26254,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "sporthall" @@ -26298,4 +26276,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "stadion" @@ -26318,4 +26298,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -26517,158 +26499,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Amerikansk fotboll" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Redigera amerikansk fotboll" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Australisk fotboll" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Redigera australisk fotboll" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Australisk fotboll" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Redigera australisk fotboll" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Redigera amerikansk fotboll" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Redigera australisk fotboll" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Redigera amerikansk fotboll" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Redigera amerikansk fotboll" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Redigera rugby" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Redigera rugby" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Redigera baseball" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Basket" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Redigera basket" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Redigera golf" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "golf_bana" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Redigera boule" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Cricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Redigera cricket" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Cricketnät" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Redigera cricketnät" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Krocket" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Redigera krocket" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Ishockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Redigera ishockey" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Redigera pelota" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Rackets" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Redigera rackets" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Redigera rugby" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Bordtennis" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Redigera bordtennis" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Redigera tennis" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Byggnad" @@ -26676,5 +26694,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Offentlig byggnad" @@ -26682,10 +26700,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Redigera offentlig byggnad" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Stadshus" @@ -26693,10 +26711,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Redigera stadshus" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Ambassad" @@ -26704,10 +26722,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Redigera ambassad" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Domstol" @@ -26716,10 +26734,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Redigera domstol" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Fängelse" @@ -26728,10 +26746,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Redigera fängelse" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Polisstation" @@ -26741,10 +26759,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Redigera polisstation" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Brandstation" @@ -26753,10 +26771,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Redigera brandstation" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Postkontor" @@ -26764,5 +26782,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Redigera postkontor" @@ -26770,15 +26788,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Barndaghem" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Redigera barndaghem" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Skola" @@ -26786,10 +26804,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Redigera skola" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Högskola/universitet" @@ -26797,10 +26815,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Redigera högskola/universitet" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Högskola" @@ -26808,5 +26826,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Redigera högskola" @@ -26814,5 +26832,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Biograf" @@ -26821,10 +26839,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Redigera biograf" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Bibliotek" @@ -26833,9 +26851,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Redigera bibliotek" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Konstcenter" @@ -26843,10 +26861,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Redigera konstcenter" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Teater" @@ -26855,10 +26873,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Redigera teater" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Religiös helgedom" @@ -26868,5 +26886,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Redigera religiös helgedom" @@ -26875,6 +26893,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Religion" @@ -26883,66 +26901,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "buddism" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "kristendom" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hinduism" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "judendom" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "islam" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "daoism" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "zoroastrianism" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Samfund" @@ -26951,81 +26969,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglikaner" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptister" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "katoliker" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "evangelister" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "jehovas_vittnen" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "luteraner (inkl. Svenska kyrkan)" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "metodister" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormoner" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "ortodoxa" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "pinstvänner" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "presbytarianer" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestanter" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "kväkare" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "shiamuslimer" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "sunnimuslimer" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Adresser" @@ -27034,5 +27052,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Redigera adressinformation" @@ -27040,5 +27058,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Husnummer" @@ -27046,25 +27064,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Husnamn" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Gatunamn" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Stadsnamn" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Postnummer" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Landskod" @@ -27073,5 +27091,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Redigera adressinterpolation" @@ -27079,61 +27097,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Numreringsschema" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "udda" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "jämn" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Byggnadsverk" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Fabrik" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Redigera fabriksbyggnad" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Torn" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Redigera torn" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "" @@ -27141,25 +27159,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Vattentorn" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Redigera vattentorn" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Gasklocka" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Redigera gasklocka" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Fyrtorn" @@ -27167,10 +27185,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Fyrtorn" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Väderkvarn" @@ -27178,10 +27196,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Redigera väderkvarn" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Rörledning" @@ -27190,41 +27208,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Redigera rörledning" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "naturgas" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Plats" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Reningsverk" @@ -27234,10 +27252,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Redigera reningsverk" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Kran" @@ -27245,5 +27263,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Redigera kran" @@ -27251,10 +27269,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Redigera fyrbåk" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Mätpunkt" @@ -27262,10 +27280,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Redigera mätpunkt" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Övervakning" @@ -27273,23 +27291,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Redigera övervakningskamera" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Kraftverk" @@ -27299,35 +27317,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Redigera ett kraftverk" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "vindkraft" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "vattenkraft" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fossila bränslen" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "kärnkraft" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "kolkraft" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "solkraft" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Kraftstation" @@ -27336,10 +27354,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Redigera en kraftstation" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Transformatorstation" @@ -27348,5 +27366,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Redigera en transformatorstation" @@ -27354,10 +27372,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Kraftledningsmast" @@ -27368,23 +27386,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Redigera en kraftledningsmast" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Kraftledning" @@ -27393,74 +27411,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Redigera en kraftledning" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Inrättningar" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Toaletter" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Anteckning" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Brevlåda" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telefon" @@ -27469,5 +27487,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Redigera en telefon" @@ -27475,5 +27493,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Mynt" @@ -27481,5 +27499,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Anteckningar" @@ -27487,5 +27505,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Betalkort" @@ -27493,5 +27511,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Kontokort" @@ -27499,15 +27517,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Kreditkort" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Telefonkort" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Återvinning" @@ -27516,5 +27534,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Redigera en återvinningsstation" @@ -27522,35 +27540,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Batterier" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Burkar" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Kläder" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Glas" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Papper" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Metallskrot" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "" @@ -27558,5 +27576,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "" @@ -27565,31 +27583,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "" @@ -27668,5 +27686,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27676,31 +27694,31 @@ msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Jakttorn" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Redigera ett jakttorn" @@ -27709,30 +27727,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Höjd" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "låg" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "halv" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "full" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Dölj" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Lås" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Fontän" @@ -27741,10 +27759,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Redigera en fontän" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Dricksvatten" @@ -27753,10 +27771,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Redigera dricksvattensfacilitet" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "" @@ -27765,5 +27783,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "" @@ -27771,5 +27789,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "" @@ -27777,15 +27795,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Affärer" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "" @@ -27793,10 +27811,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Redigera bilförsäljare" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "" @@ -27805,28 +27823,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Redigera cykelaffär" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Stormarknad" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Redigera stormarknad" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Hygien" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Redigera hygienbutik" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Närköp" @@ -27834,9 +27852,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Redigera närköp" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Kiosk" @@ -27844,27 +27862,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Redigera kiosk" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Bokhandel" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Redigera bokhandel" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Resebyrå" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Redigera resebyrå" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "Slakteri" @@ -27872,9 +27890,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Redigera slakteri" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Bageri" @@ -27882,9 +27900,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Redigera bageri" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Florist" @@ -27892,18 +27910,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Redigera florist" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Alkohol" @@ -27911,54 +27929,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Redigera alkoholbutik" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Drycker" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Dator" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Redigera datoraffär" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Elektronik" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Redigera elektronikaffär" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Redigera hifi-affär" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Möbler" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Redigera möbelaffär" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Trädgårdscenter" @@ -27966,9 +27984,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Redigera trädgårdscenter" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Järnvaror" @@ -27976,9 +27994,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Redigera järnaffär" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Gör-det-själv-affär" @@ -27986,54 +28004,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Redigera gör-det-själv-affär" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Kontorsmaterial" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Redigera pappershandel" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Hårfrisör" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Redigera hårfrisör" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Skor" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Redigera skoaffär" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Leksaker" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Redigera leksaksaffär" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Videobutik" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Redigera videobutik" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Kemtvätt" @@ -28041,9 +28059,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Redigera kemtvätt" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Tvätteri" @@ -28051,9 +28069,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Redigera tvätteri" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Friluftsliv" @@ -28061,24 +28079,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Redigera affär för friluftsliv" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Redigera sportaffär" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Optiker" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Redigera optiker" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Automat" @@ -28086,5 +28104,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Redigera en automat" @@ -28092,97 +28110,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Varor till försäljning" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "biljetter för allmänna transportmedel" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "parkeringsbiljetter" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "mat" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "dryck" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "godis" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "cigaretter" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "foton" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "djurmat" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "tidningar" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "leksaker" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "frimärken" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-kort" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "telefonkort" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "kondomer" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tamponger" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "hundpåsar" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Pengar" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Bank" @@ -28190,14 +28208,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Redigera bank" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Uttagsautomat" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Växlingskontor" @@ -28205,5 +28223,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Redigera växlingskontor" @@ -28211,15 +28229,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Redigera uttagsautomat" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Hälsovård" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Läkare" @@ -28227,18 +28245,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Redigera läkare" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Tandläkare" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Redigera tandläkare" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Apotek" @@ -28246,5 +28264,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Redigera apotek" @@ -28252,9 +28270,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Receptutlämnande" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Sjukhus" @@ -28262,10 +28280,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Redigera sjukhus" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "" @@ -28274,5 +28292,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "" @@ -28281,20 +28299,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Telefonnummer" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "Använd internationellt format, ex +12-345-67890" @@ -28302,5 +28320,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Veterinär" @@ -28309,64 +28327,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Redigera veterinär" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Geografi" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Platser" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Kontinent" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Redigera en kontinent" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Land" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Redigera land" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Delstat" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Redigera delstat" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Region" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Redigera region" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Län" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Redigera län" @@ -28374,15 +28392,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Stad" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Redigera stad" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Småstad" @@ -28390,10 +28408,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Redigera småstad" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Förort" @@ -28401,25 +28419,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Redigera förort" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Mindre tätort" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Redigera mindre tätort" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Småort" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Redigera småort" @@ -28427,5 +28445,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Plats" @@ -28433,10 +28451,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Redigera plats" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Ö" @@ -28444,10 +28462,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Redigera ö" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Holme" @@ -28455,5 +28473,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Redigera holme" @@ -28461,5 +28479,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Grottöppning" @@ -28467,10 +28485,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Redigera en grottöppning" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Topp" @@ -28478,10 +28496,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Redigera topp" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Glaciär" @@ -28489,10 +28507,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Redigera en glaciär" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Vulkan" @@ -28500,70 +28518,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Redigera en vulkan" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Gränser" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Nationell" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Redigera nationsgränser" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Administrativ" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Redigera administrativa gränser" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Civilrättslig" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Redigera en civilrättslig gräns" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Politisk" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Redigera politiska gränser" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Nationalpark" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Redigera gräns för nationalpark" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Markanvändning" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Träd" @@ -28572,15 +28590,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Redigera ett träd" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Botaniskt namn" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Naturskog" @@ -28589,5 +28607,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Redigera naturskog" @@ -28595,17 +28613,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "barrskog" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "lövskog" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "blandskog" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Kulturskog" @@ -28614,14 +28632,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Redigera användning av mark för skogsbruk" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Naturreservat" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Redigera naturreservat" @@ -28629,25 +28647,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Bergsluttning (med lösa stenar)" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Redigera bergssluttning (med lösa stenar)" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Buskage" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Redigera buskage" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Höglandshed" @@ -28655,10 +28673,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Redigera en höglandshed" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Hed" @@ -28666,5 +28684,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Redigera hed" @@ -28672,5 +28690,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Gårdsplan" @@ -28679,45 +28697,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Redigera markanvändning som gårdsplan" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Jordbruksmark" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Redigera användning av mark för jordbruk" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Äng" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Redigera markanvändning som äng" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Vingård" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Redigera användning av mark för vingård" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Kolonilotter" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Redigera användning av mark för koloniområden" @@ -28725,25 +28743,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Trädgård" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Redigera trädgård" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Gräs" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Redigera markanvändning som gräsyta" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Allmänning" @@ -28751,10 +28769,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Redigera användning av mark för allmänning" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Allmänning" @@ -28762,20 +28780,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Redigera allmänning" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Redigera park" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Fritidsområde" @@ -28783,5 +28801,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Redigera användning av mark för fritidsområde" @@ -28789,15 +28807,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Bostadsområde" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Redigera användning av mark för bostadsområde" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Kyrkogård" @@ -28805,9 +28823,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Redigera kyrkogård" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Begravningsplats" @@ -28815,39 +28833,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Redigera användning av mark för begravningsplats" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Detaljhandel" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Redigera användning av mark för detaljhandel" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Affärsområde" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Redigera användning av mark för affärsområde" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Industriområde" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Redigera användning av mark för industriområde" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Järnvägsmark" @@ -28855,15 +28873,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Redigera användning av mark för järnvägsmark" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Militärt område" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Redigera användning av mark för militärt område" @@ -28871,50 +28889,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Byggnadsplats" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Redigera markanvändning som byggnadsplats" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Deponi" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Redigera användning av mark för deponi av avfall" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Stenbrott" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Redigera användning av mark för stenbrott" @@ -28924,5 +28942,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Redigera en multipolygon" @@ -28934,5 +28952,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "yttre segement" @@ -28940,5 +28958,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "inre segment" @@ -28946,5 +28964,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -28955,5 +28973,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -28961,36 +28979,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -28998,5 +29016,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "" @@ -29005,5 +29023,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "" @@ -29011,34 +29029,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Begränsning" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "ingen_vänstersväng" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "ingen_högersväng" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "inte_rakt_fram" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "ingen_u_sväng" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "enbart_högersväng" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "enbart_vänstersväng" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "enbart_rakt_fram" @@ -29047,15 +29065,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "från sträcka" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "via nod eller sträcka" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "till sträcka" @@ -29063,5 +29081,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Rutt" @@ -29070,5 +29088,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Redigera rutt" @@ -29076,5 +29094,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Ruttyp" @@ -29182,5 +29200,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29191,17 +29209,17 @@ msgstr "cykel" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "buss" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "" @@ -29269,5 +29287,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29277,9 +29295,9 @@ msgstr "fot" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "" @@ -29293,10 +29311,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "tunnelbana" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "" @@ -29304,31 +29322,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "" @@ -29337,30 +29355,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "" @@ -29587,5 +29605,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "förlegad" @@ -32913,11 +32931,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "plats" @@ -32931,5 +32949,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" @@ -33284,4 +33302,19 @@ msgid "Sicily - Italy" msgstr "" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Ja, återskapa dem också" + +#~ msgid "No, cancel operation" +#~ msgstr "Nej, avbryt" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Återskapa ytterligare noder?" + +#~ msgid "football" +#~ msgstr "amerikansk fotboll" + +#~ msgid "Football" +#~ msgstr "Amerikansk fotboll" #~ msgid "Move" Index: /applications/editors/josm/i18n/po/tr.po =================================================================== --- /applications/editors/josm/i18n/po/tr.po (revision 22208) +++ /applications/editors/josm/i18n/po/tr.po (revision 22209) @@ -10,6 +10,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-23 22:04+0000\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-28 16:10+0000\n" "Last-Translator: Angel Spy \n" "Language-Team: Türkçe\n" @@ -18,5 +18,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:06+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -29,5 +29,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -71,5 +71,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -79,5 +79,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -241,5 +241,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -247,6 +247,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -332,8 +332,7 @@ msgstr "Hedef katman yok" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Nokta Ekle..." @@ -655,5 +654,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1034,5 +1033,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1041,5 +1040,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1176,4 +1175,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "" @@ -1446,6 +1446,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1664,6 +1664,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2279,5 +2277,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2518,10 +2516,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Ara..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Objeleri ara." @@ -2529,65 +2527,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Lütfen bir aramametni giriniz." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Arama ifadesini girin" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "seçimi değiştiriniz" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "seçime ekleyiniz" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "Seçimden çıkartınız" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "seçimde ara" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "Harf hassas" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "ifade anlatımı" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2595,38 +2593,38 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Özel hedefler:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2634,5 +2632,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2640,5 +2638,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2646,5 +2644,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2652,9 +2650,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2662,39 +2660,39 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2702,12 +2700,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2716,38 +2714,51 @@ msgstr "Süzgeç" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Arama" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Süzgeç ekle" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Arama Başlat" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Arama ifadesini girin" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "''{0}'' için herhangi karşılık bulunamadı" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "''{0}'' için yapılan aramada herhangi bir ekleme yapılmadı." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "''{0}'' için yapılan aramada, herhangi birşey çıkartılmadı" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2755,5 +2766,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2761,5 +2772,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2767,5 +2778,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2773,5 +2784,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2895,8 +2906,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3035,5 +3046,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3159,11 +3170,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3172,5 +3183,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3179,5 +3190,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3215,5 +3226,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3524,6 +3535,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3533,10 +3544,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3544,5 +3555,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3551,5 +3562,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3557,78 +3568,4 @@ #, java-format msgid "Missing merge target of type {0} with id {1}" -msgstr "" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "metin" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -3757,5 +3694,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "arkaplan" @@ -3925,5 +3862,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "demiryolu" @@ -3944,7 +3881,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4010,7 +3947,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "yapılar" @@ -4098,5 +4035,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4320,5 +4257,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4617,12 +4554,12 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4633,6 +4570,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4640,6 +4577,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4647,9 +4584,9 @@ msgstr "Üyeler" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4658,5 +4595,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4665,26 +4602,26 @@ msgstr[1] "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +msgid "Nodes(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 -msgid "Nodes(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +msgid "Nodes(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 -msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +msgid "Members(resolved)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 -msgid "Members(resolved)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4692,25 +4629,25 @@ msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +msgid "Members(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 -msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +msgid "Properties(with conflicts)" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 -msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "" @@ -4756,5 +4693,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "" @@ -4765,5 +4702,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4777,5 +4714,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "" @@ -4844,5 +4781,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4854,5 +4791,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "" @@ -4951,60 +4888,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5012,123 +4898,58 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "silindi" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" msgstr "" @@ -5276,5 +5097,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "hepsi" @@ -5354,7 +5175,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5363,6 +5184,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5547,5 +5368,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5601,25 +5422,25 @@ msgstr "Haritada seçili elemanları listedede seç." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 +msgid "Apply resolved conflicts and close the dialog" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 -msgid "Apply resolved conflicts and close the dialog" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 msgid "Apply Resolution" msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 +msgid "Close anyway" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 -msgid "Close anyway" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 msgid "Continue resolving" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5631,22 +5452,22 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5659,43 +5480,122 @@ msgstr "Ekle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "" +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 +msgid "Enable filter" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 +msgid "Hide elements" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 -msgid "Enable filter" +msgid "Inverse filter" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 -msgid "Hide elements" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 -msgid "Inverse filter" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 msgid "Filter mode" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Dosya Yüklemede Sorun" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "metin" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" msgstr "" @@ -5738,37 +5638,37 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Yeni nokta için koordinat giriniz." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Ondalık derece kullan." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Negatif sayılar Batı/Güney yarımküreyi gösterir ." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Lütfen -90..90 aralığında geçerli bir enlem değeri girin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Lütfen -90..90 aralığında bir enlem değeri girin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Lütfen -90..90 aralığında geçerli bir boylam değeri girin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Lütfen -90..90 aralığında bir boylam değeri girin" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "" @@ -5828,5 +5728,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "İlişkiler" @@ -5874,10 +5774,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "" @@ -5941,14 +5841,14 @@ msgstr "Seçim.: İlişki.:{0} / Yollar:{1} / Kavşaklar:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Seçim: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "" @@ -6649,8 +6549,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6675,6 +6583,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7057,69 +6963,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "İsim" @@ -7695,5 +7602,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8330,8 +8237,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Tip" @@ -8360,6 +8267,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "bilinmeyen" @@ -8680,5 +8587,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "" @@ -9196,4 +9103,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9693,5 +9601,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "" @@ -9740,5 +9648,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -9814,23 +9722,23 @@ "Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "indirilen alanın dışında" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9839,34 +9747,11 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -9875,32 +9760,32 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} şunları içerir:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "GPX tabakasına çevir" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "" @@ -12825,4 +12710,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14277,5 +14163,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14544,5 +14430,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Adres İnterpolasyon" @@ -14976,36 +14862,36 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 +msgid "on polygon" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "adres" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Yeni ilişki oluştur" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Binalar" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Numara" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Sonraki" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Adres" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15159,10 +15045,14 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." msgstr "" @@ -15217,7 +15107,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15226,13 +15116,13 @@ msgstr "su" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "" @@ -15280,32 +15170,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "adres" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15317,18 +15207,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15336,5 +15226,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15342,130 +15232,134 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." msgstr "" @@ -15766,5 +15660,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -15773,14 +15667,14 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "" @@ -17053,4 +16947,23 @@ msgstr "" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17091,9 +17004,4 @@ #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75 msgid "Create Stops from a GPX file" -msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" msgstr "" @@ -18598,5 +18506,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Diğerleri" @@ -18781,5 +18689,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "" @@ -19304,5 +19212,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "alan" @@ -19347,34 +19255,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Görüntü Yok" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19397,7 +19308,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Etiketsiz yollar" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20314,7 +20224,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Dosya aç." +msgstr "" #. Strings in JFileChooser @@ -20596,7 +20505,14 @@ msgstr "" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20605,10 +20521,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -20617,5 +20533,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -20624,15 +20540,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -20642,10 +20558,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -20654,5 +20570,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -20661,5 +20577,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -20668,10 +20584,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -20680,5 +20596,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -20688,5 +20604,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -20695,15 +20611,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -20712,5 +20628,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -20843,5 +20759,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Referans" @@ -21380,5 +21296,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "" @@ -21391,5 +21307,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "orman" @@ -21694,8 +21610,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "Evet" @@ -21806,8 +21722,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "hayır" @@ -22113,5 +22029,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "servis" @@ -22231,5 +22147,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "" @@ -22378,4 +22294,9 @@ msgid "Edit Motorway Junction" msgstr "Otoyol Kavşağı birleştirme" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Numara" #. item "Waypoints/Motorway Junction" text "Number" @@ -22428,13 +22349,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Operator" @@ -22702,6 +22623,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "yükseklik" @@ -23553,5 +23474,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Voltaj" @@ -23922,24 +23843,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Açılış saati" @@ -24006,23 +23927,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "" @@ -24036,23 +23957,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "" @@ -24066,23 +23987,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "" @@ -24196,6 +24117,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Referans Numarası" @@ -24211,5 +24132,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "yer altı" @@ -24223,5 +24144,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Ücret" @@ -24397,5 +24318,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "tekerlekli sandalye" @@ -24433,5 +24354,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Sığınak" @@ -24439,5 +24360,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "banket" @@ -24556,5 +24477,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Fener" @@ -25293,5 +25214,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "" @@ -25366,5 +25287,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25478,12 +25447,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25550,12 +25511,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25569,12 +25522,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -25736,5 +25681,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "spor" @@ -25761,4 +25707,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "avustralya_footbol" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "avustralya_footbol" @@ -25786,4 +25738,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "avustralya_footbol" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "kano" @@ -25826,6 +25784,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "futbol" +#, fuzzy +msgid "gaelic_football" +msgstr "avustralya_footbol" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -25866,5 +25825,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "rugby" @@ -25985,6 +25950,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -25998,5 +25967,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26018,4 +25986,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "tip" @@ -26039,6 +26009,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26051,5 +26025,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26071,4 +26044,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "atıcılık" @@ -26091,4 +26066,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "spor_merkezi" @@ -26111,4 +26088,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "stadyum" @@ -26131,4 +26110,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -26330,158 +26311,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Amerikan Futbolu" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Amerikan Futbolu Düzenle" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Avustralyan Futbol" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Avustralyan Futbol Düzenle" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Avustralyan Futbol" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Avustralyan Futbol Düzenle" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Amerikan Futbolu Düzenle" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Avustralyan Futbol Düzenle" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Amerikan Futbolu Düzenle" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Amerikan Futbolu Düzenle" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Rugby Düzenle" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Rugby" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Rugby Düzenle" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Baseball" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Baseball Düzenle" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Basketbol" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Basketbol Düzenle" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Golf" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Golf Düzenle" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "golf_alanı" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Boule" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Boule Düzenle" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Bowling" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Bowling Düzenle" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Kricket" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Kricket Düzenle" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Cricket Nets" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Cricket Nets Düzenle" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Kroke" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "kroke Düzelt" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Hockey" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Hockey Düzenle" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Pelota" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Pelota Düzenle" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Raket" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Raket Düzenle" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Rugby" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Rugby Düzenle" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Masa Tenisi" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Masa Tenisi Düzenle" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Tennis" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Tennis Düzenle" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Bina" @@ -26489,5 +26506,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Kamu Binası" @@ -26495,10 +26512,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Kamu Binası Düzenle" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "belediye binası" @@ -26506,10 +26523,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "belediye binası düzenle" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Büyükelçilik" @@ -26517,10 +26534,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Büyükelçilik Düzenle" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "adliye sarayı" @@ -26529,10 +26546,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "adliye sarayı düzenle" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "Hapishane" @@ -26541,10 +26558,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Hapishane Düzenle" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Polis" @@ -26554,10 +26571,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Polis Düzenle" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "İtfaye İstasyonu" @@ -26566,10 +26583,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "İtfaye İstasyonu Düzenle" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Postane" @@ -26577,5 +26594,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Postane Düzenle" @@ -26583,15 +26600,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Anaokul" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Anaokul Düzenle" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Okul" @@ -26599,10 +26616,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "okul düzenle" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Universite" @@ -26610,10 +26627,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Universite Düzenle" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "kolej" @@ -26621,5 +26638,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "kolej düzenle" @@ -26627,5 +26644,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Sinema" @@ -26634,10 +26651,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Sinema Düzenle" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "kütüphane" @@ -26646,9 +26663,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "kütüphane düzenle" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "sanat merkezi" @@ -26656,10 +26673,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "sanat merkezi düzenle" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Tiyatro" @@ -26668,10 +26685,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Tiyatro Düzenle" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Tapınak" @@ -26681,5 +26698,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Tapınak Düzenle" @@ -26688,6 +26705,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Din" @@ -26696,66 +26713,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "bahai" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "budist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "hristiyan" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "hindu" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "jain" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "yahudi" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "müslüman" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "sikh" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "spiritualist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "taoist" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "Zerdüştlük" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "mezhep" @@ -26764,81 +26781,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "anglikan" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "baptist" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "katholik" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "protestan" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "yahova_şahitleri" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "lutheran" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "methodist" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "mormon" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "orthodox" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "pentecostal" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "presbyterian" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "protestant" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "quaker" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "shia" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "sunni" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Adres" @@ -26847,5 +26864,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Adres Bilgileri Düzenle" @@ -26853,5 +26870,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Ev no:" @@ -26859,25 +26876,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Ev İsmi" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Sokak Adı" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Şehir Adı" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Posta Kodu" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Ülke Kodu" @@ -26886,5 +26903,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Adres İnterpolasyon Düzenle" @@ -26892,61 +26909,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Numara şeması" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "tek" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "çift" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "İnsan Yapımı" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Tesis" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Tesis Düzenle" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Kule" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Kule Düzenle" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "" @@ -26954,25 +26971,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Su Kulesi" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Su Kulesi Düzenle" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Gazdeposu" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Gazdeposu Düzenle" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "DenizFeneri" @@ -26980,10 +26997,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "DenizFeneri Düzenle" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Yeldeğerimeni" @@ -26991,10 +27008,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Yeldeğerimeni Düzenle" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Suboru Hattı" @@ -27003,41 +27020,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Suboru hattı Düzenle" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "benzin" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Kanalizasyon Plant" @@ -27047,10 +27064,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Kanalizasyon Plant Düzenle" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Vinç" @@ -27058,5 +27075,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Vinç Düzenle" @@ -27064,10 +27081,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Fener Düzenle" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Poligon Noktası" @@ -27075,10 +27092,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Poligon Noktası Düzenle" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Gözetim" @@ -27086,23 +27103,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Gözetim Kamera Düzenle" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Güç Jeneratorü" @@ -27112,35 +27129,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Güç Jeneratorü Düzenle" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "rüzgar" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "hidro" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "fosil" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "nükleer" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "kömür" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "güneş enerjisi" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Güç İstasyonu" @@ -27149,10 +27166,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Güç İstasyonu Düzenle" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Alt Güç İstasyonu" @@ -27161,5 +27178,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Alt Güç İstasyonu Düzenle" @@ -27167,10 +27184,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "çizgi referansı" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Güç Kulesi" @@ -27181,23 +27198,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "güç Kulesi Düzenle" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Güç Hattı" @@ -27206,74 +27223,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Güç Hattı Düzenle" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "hoş mekan" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Tuvalet" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Not" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Posta Kutusu" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Telefon" @@ -27282,5 +27299,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Telefon Düzenle" @@ -27288,5 +27305,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Madeni Para" @@ -27294,5 +27311,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Notlar" @@ -27300,5 +27317,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Elektronik cüzdan ve Para Değişim Kartları" @@ -27306,5 +27323,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "ATM kartı" @@ -27312,15 +27329,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Kredi Kartı" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Telefon kart" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Geri Dönüşüm" @@ -27329,5 +27346,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Geri Dönüşüm İstasyonu" @@ -27335,35 +27352,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Piller" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Çöp Tenekesi" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Kıyafet" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Cam" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Kağıt" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Hurda Metal" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "" @@ -27371,5 +27388,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "" @@ -27378,31 +27395,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "" @@ -27481,5 +27498,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27489,31 +27506,31 @@ msgstr "yeşil" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Av Standı" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Av Standı Düzenle" @@ -27522,30 +27539,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Yükseklik" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "alçak" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "yarım" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "tam" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Sakla" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Kilitle" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Kaynak" @@ -27554,10 +27571,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Kaynak Düzenle" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "İçme Suyu" @@ -27566,10 +27583,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "İçme Suyu Düzenle" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "" @@ -27578,5 +27595,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "" @@ -27584,5 +27601,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Bebek Yuvası" @@ -27590,15 +27607,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Bebek Yuvası Düzenle" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Dükkanlar" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "" @@ -27606,10 +27623,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "araçlı alışveriş düzenle" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "" @@ -27618,28 +27635,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Bisiklet dükkanı düzenle" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Supermarket" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Supermarket Düzenle" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Bakkal" @@ -27647,9 +27664,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Bakkal Düzenle" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Kiosk" @@ -27657,27 +27674,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Kiosk Düzenle" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "kasap" @@ -27685,9 +27702,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "kasap düzenle" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "fırın" @@ -27695,9 +27712,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "fırın düzenle" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "" @@ -27705,18 +27722,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "" @@ -27724,54 +27741,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "" @@ -27779,9 +27796,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "" @@ -27789,9 +27806,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "kendin-al-market" @@ -27799,54 +27816,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "kendin-al-market düzenle" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "berber" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "berber düzenle" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Kuru Temizleme" @@ -27854,9 +27871,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Kuru Temizleme Düzenle" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Çamaşırhane" @@ -27864,9 +27881,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Çamaşırhane Düzenle" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Dışortam" @@ -27874,24 +27891,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Dış ortam dükkanları düzenle" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Kahve Makinası" @@ -27899,5 +27916,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Kahve Makinası Düzenle" @@ -27905,97 +27922,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Ücretli Ürünler" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "toplu_taşıma_bileti" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "toplu_taşıma_hatları" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "Park_bileti" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "yiyecek" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "içecek" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "tatlı" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "sigara" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "fotoğraf" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "hayvan_besini" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "gazeteler" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "oyuncuklar" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "pullar" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-kart" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "telefon_kartı" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "bilet" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "kondom" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "tampon" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "dışkı_poşeti" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "hesap veya üyelik kartı" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Kasa" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Banka" @@ -28003,14 +28020,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Banka düzenle" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "ATM" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Döviz Bürosu" @@ -28018,5 +28035,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Döviz Bürosu Düzenle" @@ -28024,15 +28041,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "ATM Düzenle" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Sağlık" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Doktor" @@ -28040,18 +28057,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Doktor Düzenle" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Dişçi" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Dişçi Düzenle" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Eczane" @@ -28059,5 +28076,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Eczane Düzenle" @@ -28065,9 +28082,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "Dispenser" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Hastane" @@ -28075,10 +28092,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Hastane Düzenle" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Acil Durum Noktası" @@ -28087,5 +28104,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Acil Durum Noktası Düzenle" @@ -28094,20 +28111,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Nokta Numarası" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Telefon Numarası" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Uluslararası kod kullanın, ör +90-212-67890)" @@ -28115,5 +28132,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Veteriner" @@ -28122,64 +28139,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Veteriner Düzenle" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Yerler" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Kıta" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Kıta Düzenle" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Ülke" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Ülke Düzenle" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "İl" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "İl Düzenle" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Bölge" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Bölge Düzenle" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "vilayet" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "vilayet Düzenle" @@ -28187,15 +28204,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Şehir" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Şehir Düzenle" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Mahalle" @@ -28203,10 +28220,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Mahalle Düzenle" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Banliyo" @@ -28214,25 +28231,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Banliyo Düzenle" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Köy" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Köy Düzenle" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Mezra" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Mezra Düzenle" @@ -28240,5 +28257,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Semt" @@ -28246,10 +28263,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Semt Düzenle" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Ada" @@ -28257,10 +28274,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Ada Düzenle" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "" @@ -28268,5 +28285,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "" @@ -28274,5 +28291,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Mağara Girişi" @@ -28280,10 +28297,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Mağara Girişi Düzenle" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Zirve" @@ -28291,10 +28308,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Zirve Düzenle" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Buzul" @@ -28302,10 +28319,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Buzul Düzenle" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Volkan" @@ -28313,70 +28330,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Volkan Düzenle" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Belediye Sınırı" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Milli" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Ülke Sınırı Düzenle" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "İdari" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "İdari Sınırları Düzenle" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Sivil" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Sivil Sınırları Düzenle" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Politik Sınır Düzenle" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Milli Park Sınırı Düzenle" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Arazi Kullanımı" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Ağaç" @@ -28385,15 +28402,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Ağaç Düzenle" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Botannik İsim" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Orman" @@ -28402,5 +28419,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Orman Düzenle" @@ -28408,17 +28425,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "Kozalaklı Orman" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "yaprak düken orman" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "karışık" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "orman" @@ -28427,14 +28444,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "orman kullanımı düzenle" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "korunacak doğa alanı" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "korunacak doğa alanı düzenle" @@ -28442,25 +28459,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Taşlık Alan" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Taşlık Alan Düzenle" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Çalılık" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Çalılık Düzenle" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Dağ Eteği" @@ -28468,10 +28485,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Dağ Eteği Kullanımı" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Sağlıksız Ağaç" @@ -28479,5 +28496,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Sağlıksız Ağaç Düzenle" @@ -28485,5 +28502,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Çiftlik" @@ -28492,45 +28509,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Çiftlik Kullanımı Düzenle" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Çiftlik Arazisi" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Çiftlik Arazisi Kullanımı Düzenle" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Bağ" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Bağ Kullanımı Düzenle" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Kiralık Tarım Alanı" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Kiralık Tarım Alanı Düzenle" @@ -28538,25 +28555,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Bahçe" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Bahçe Düzenle" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Otlak" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Otlak Kullanım Düzenle" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Köy Yerleşimi" @@ -28564,10 +28581,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Köy Yerleşimi Düzenle" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Genel" @@ -28575,20 +28592,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Genel Düzenle" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Park" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Park Düzenle" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "oyun alanı" @@ -28596,5 +28613,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "oyun alanı kullanımı düzenle" @@ -28602,15 +28619,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Yerleşim Alanı" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Yerleşim Alanı Kullanımı Düzenle" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Mezarlık" @@ -28618,9 +28635,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Mezarlık Düzenle" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Mezarlık" @@ -28628,39 +28645,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Mezarlık Kullanımı Düzenle" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Perakende" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Perakende Alan Kullanımı Düzenle" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Ticari" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Ticari Alan Kullanımı Düzenle" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Endüstriyel" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Endüstriyel Alan Kullanımı Düzenle" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Demiryolu alanı" @@ -28668,15 +28685,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Demiryolu alanı kullanımı düzenle" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Askeri" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Askeri Alan Düzenle" @@ -28684,50 +28701,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "İnşaat Alanı" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "İnşaat Alanı Düzenle" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Ağaçsız_Alan" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Ağaçsız_Alan Kullanımı Düzenle" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Yeşil Alan" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "yeşil Alan kullanımı düzenle" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Toprak Dolum" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Toprak Dolum Alanı Düzenle" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Taşocağı" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "taşocağı Düzenle" @@ -28737,5 +28754,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "" @@ -28747,5 +28764,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "" @@ -28753,5 +28770,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "" @@ -28759,5 +28776,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -28768,5 +28785,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -28774,36 +28791,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -28811,5 +28828,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "" @@ -28818,5 +28835,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "" @@ -28824,34 +28841,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "" @@ -28860,15 +28877,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "" @@ -28876,5 +28893,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "" @@ -28883,5 +28900,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "" @@ -28889,5 +28906,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "" @@ -28995,5 +29012,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29004,17 +29021,17 @@ msgstr "bisiklet" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "otobüs" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "" @@ -29082,5 +29099,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29090,9 +29107,9 @@ msgstr "ayak" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "" @@ -29106,10 +29123,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "metro" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "" @@ -29117,31 +29134,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "" @@ -29150,30 +29167,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "" @@ -29400,5 +29417,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "kırılmış" @@ -32726,11 +32743,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "yer" @@ -32744,5 +32761,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" @@ -33097,4 +33114,10 @@ msgid "Sicily - Italy" msgstr "Sicilya - İtalya" + +#~ msgid "football" +#~ msgstr "futbol" + +#~ msgid "Football" +#~ msgstr "Amerikan Futbolu" #~ msgid "Do not show again" Index: /applications/editors/josm/i18n/po/uk.po =================================================================== --- /applications/editors/josm/i18n/po/uk.po (revision 22208) +++ /applications/editors/josm/i18n/po/uk.po (revision 22209) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-26 19:19+0000\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-28 18:05+0000\n" "Last-Translator: andygol \n" "Language-Team: Ukrainian \n" @@ -17,5 +17,5 @@ "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: 2010-06-28 14:49+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:07+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -28,5 +28,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -70,5 +70,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -78,5 +78,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -246,5 +246,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -252,6 +252,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -341,8 +341,7 @@ msgstr "Шар не обрано" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "Додати точку…" @@ -663,5 +662,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1048,5 +1047,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1055,5 +1054,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1192,4 +1191,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "Переміщення точки…" @@ -1494,6 +1494,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1716,6 +1716,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2382,5 +2380,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2635,10 +2633,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "Пошук…" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "Пошук об’єктів" @@ -2646,67 +2644,67 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "Будь ласка, введіть рядок фільтра." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "Будь ласка, введіть рядок для пошуку." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "Введіть вираз для пошуку" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "замінити виділене" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "додати до виділеного" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "прибрати з виділеного" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "знайти у виділеному" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "з врахуванням регістру" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "усі об’єкти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "Також включати в результати пошуку вилучені та неповні об’єкти." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "регулярний вираз" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "" "Baker Street — ''Baker'' та ''Street'' у будь-якому ключі чи назві." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "" "\"Baker Street\" — ''Baker Street'' у будь-якому ключі чи назві." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak — ''Bak'' будь-де в назві." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route — ключ ''type'' з точним значенням ''route''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2716,21 +2714,21 @@ "*=value, type=, *=*, *=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak — назва не містить ''Bak''." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "oneway? — oneway=yes, true, 1 чи on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: — key=foot встановити в будь-яке значення." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "Спеціальні цілі:" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2739,18 +2737,18 @@ "(ліния), relation(зв’язок)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "user:… — всі об’єкти, змінені користувачем" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "user:anonymous — все об’єкти, змінені анонімним користувачем" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "" "id:… — об’єкт із зазначеним ідентифікатором (0 для нових об’єктів)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2760,5 +2758,5 @@ "встановленої версії)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2768,5 +2766,5 @@ "об’єктів, без призначеного набору змін)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2776,5 +2774,5 @@ "nodes:мін-макс)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2784,9 +2782,9 @@ "tags:мін-макс)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "роль:… — об’єкт із зазначеною роллю у зв’язку" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2796,21 +2794,21 @@ "12T14:51:09Z, 2009-11-12 або T14:51 …)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "modified — усі змінені об’єкти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "selected — усі виділені об’єкти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "incomplete — всі неповні об’єкти" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "untagged — всі об’єкти без теґів" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" @@ -2818,5 +2816,5 @@ "child вираз — усі нащадки, об’єктів що відповідають виразу" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" @@ -2824,10 +2822,10 @@ "parent вираз — усі батьки, об’єктів що відповідають виразу" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "" "Використовуйте | або OR щоб об’єднати вираження логічним «або»" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "" @@ -2835,5 +2833,5 @@ "містить :)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2843,12 +2841,12 @@ "ставити додатковий зворотній слеш (ось так: \\\" и \\\\)." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "Використовуйте ( та ) для групування виразів" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2857,38 +2855,51 @@ msgstr "Фільтр" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "Пошук" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "Додати фільтр" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "Почати пошук" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "Введіть текст для пошуку" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "Не знайдено збігів для ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "До виділеного нічого не додано в результаті пошуку ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "Нічого не вилучено з виділеного в результаті пошуку ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "У виділеному нічого не знайдено під час пошуку ''{0}''" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2896,5 +2907,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2902,5 +2913,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2908,5 +2919,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2914,5 +2925,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -3049,8 +3060,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3194,5 +3205,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3327,11 +3338,11 @@ msgstr[2] "Перемістити {0} точок" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "Очищений об’єкт ''{0}''" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3341,5 +3352,5 @@ msgstr[2] "Очищено {0} об’єктів" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3350,5 +3361,5 @@ "значення {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3387,5 +3398,5 @@ msgstr "Розв’язати {0} конфліктів теґів у зв’язку {1}" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3726,6 +3737,6 @@ "помилка, але необхідно зберегти дані, перш ніж продовжити роботу." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3735,10 +3746,10 @@ msgstr "Відсутній результат об’єднання для лінії з ідентифікатором {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Відсутній результат об’єднання для об’єкта з ідентифікатором {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3746,5 +3757,5 @@ msgstr "Відсутній результат об’єднання для точки з ідентифікатором {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3753,5 +3764,5 @@ msgstr "Відсутній результат об’єднання для зв’язку з ідентифікатором {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3760,78 +3771,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "Відсутній результат об’єднання для типу {0} з ідентифікатором {1}" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "Вкл." - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "Викл." - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "Текст" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "Замін." - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "Додати" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "Вилучити" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "З" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

Фільтр активний

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} об’єктів приховано" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "{0} об’єктів пошкоджено" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "

Закрити діалог фільтра, щоб побачити всі об’єкти.

" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3971,5 +3908,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "тло" @@ -4094,15 +4031,13 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:29 msgid "Guyane RGFG95" -msgstr "" +msgstr "Гвіана RGFG95" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (Франція)" +msgstr "Франція UTM (DOM)" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "Північна геодезична система UTM20" +msgstr "Система координат UTM" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -4143,5 +4078,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "залізниця" @@ -4162,7 +4097,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4230,7 +4165,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "будівля" @@ -4320,5 +4255,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4558,5 +4493,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4871,12 +4806,12 @@ msgstr "Роль {0} не приймає участь у парі порівняння {1}." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Властивості" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4887,6 +4822,6 @@ msgstr "Теґи" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4894,6 +4829,6 @@ msgstr "Точки" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4901,9 +4836,9 @@ msgstr "Члени" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "Конфлікти теґів, що очікують розв’язання — відсутні" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4913,5 +4848,5 @@ msgstr[2] "Теґи ({0} конфліктів)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4921,9 +4856,9 @@ msgstr[2] "Треба розв’язати {0} конфліктів теґів" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "Точки (без конфліктів)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4932,17 +4867,17 @@ "для цієї ліні — немає" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "Точки (з конфліктами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "Не розв’язані конфлікти в списку точок цієї лінії" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "Члени (без конфліктів)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4952,25 +4887,25 @@ "у списку членів цього зв’язку — відсутні" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "Члени (з конфліктами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "Не розв’язані конфлікти в списку членів цього зв’язку" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "Не розв’язані конфлікти властивостей відсутні" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "Властивості (з конфліктами)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "Конфлікти властивостей, що очікують розв’язання" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "Розв’язання конфліктів" @@ -5018,5 +4953,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "Моя версія" @@ -5027,5 +4962,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -5041,5 +4976,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "Їх версія" @@ -5118,5 +5053,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -5128,5 +5063,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "Вниз" @@ -5236,75 +5171,9 @@ "конфліктів." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "" -"Під час з’єднання з сервером виникла помилка
Подробиці: {0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "Збій під час з’єднання з сервером" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "Так, відновити їх теж" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "Ні, відмінити дію" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -"Є {0} додаткова точка, що використовується в лінії {1}
, яку вилучено на " -"сервері.

Ви бажаєте відновити цю точку також?" -msgstr[1] "" -"Є {0} додаткові точки, що використовуються в лінії {1}
, які вилучено на " -"сервері.

Ви бажаєте відновити ці точки також?" -msgstr[2] "" -"Є {0} додаткових точок, що використовуються в лінії {1}
, які вилучено на " -"сервері.

Ви бажаєте відновити ці точки також?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "Відновити додаткові точки?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -"Є {0} додатковий елемент, що входить до зв’язку {1}
, який вилучено на " -"сервері.

Ви бажаєте відновити його також?" -msgstr[1] "" -"Є {0} додаткових елементи, що входять до зв’язку {1}
, який вилучено на " -"сервері.

Ви бажаєте відновити їх також?" -msgstr[2] "" -"Є {0} додаткових елементів, що входять до зв’язку {1}
, який вилучено на " -"сервері.

Ви бажаєте відновити їх також?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "Відновити залежні елементи?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Властивості в моєму наборі даних, тобто локальному наборі даних" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5314,129 +5183,59 @@ "при застосуванні об’єднання." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Властивості в чужому наборі даних, тобто наборі даних на сервері" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "Координати:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "Вилучений:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "Видимий:" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "Посилається на:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(відсутній)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "вилучено" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "не вилучений" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "видимий ( на сервері)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "не видимий (на сервері)" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "Лишити клон локальної версії" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "Фізично вилучити з локального набору даних" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Залишити мої координати" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "Залишити чужі координати" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "Не розв’язувати конфлікт між різними координатами" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "Залишити мій стан \"Вилучений\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "Залишити чужий стан \"Вилучений\"" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "Не розв’язувати конфлікти між вилученими станами" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "Залишити мій стан \"Видимий\"" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "Так, перевстановити ідентифікатор" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" -"Щоб зберегти свою локальну версію даних, JOSM
скине ідентифікатор " -"елемента {0} на 0.
Під час наступного надсилання даних, сервер " -"призначить
їм новий ідентифікатор.
Ви згодні?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "Встановити значення ідентифікатора в 0" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "Лишити чужий стан \"Видимий\"" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "Так, очистити" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM вилучить ваш локальний елемент з ідентифікатором {0}
з набору " -"даних.
Ви згодні?" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "Вилучити з набору даних" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "Не розв’язувати конфлікти між станами \"Видимий\"" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5586,5 +5385,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "всі" @@ -5665,7 +5464,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5676,6 +5475,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5879,5 +5678,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5936,25 +5735,25 @@ msgstr "Виділити на мапі об’єкти, вибрані у списку вгорі." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "Скасувати розв’язання конфліктів і закрити діалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "Застосувати розв’язання конфліктів і закрити діалог" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "Застосувати розв’язання" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "Все одно закрити" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "Продовжити розв’язання" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5972,22 +5771,22 @@ "конфліктів." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "Конфлікт розв’язано не до кінця" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "Розв’язати конфлікти" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "Розв’язати кнофлікти для ''{0}''" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "Відфільтрувати об’єкти і приховати/відключити їх." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -6000,44 +5799,123 @@ msgstr "Додати" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "Додати фільтр." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "Редагувати фільтр." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "Вилучити фільтр." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "Перемістити фільтр вгору." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "Перемістити фільтр вниз." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "Увімкнути фільтр" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "Приховати елементи" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "Інвертувати фільтр" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "Режим фільтра" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "Фільтр Прихований:{0} Відключений:{1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "Помилка завантаження файлу" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "Вкл." + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "Викл." + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "Текст" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "Замін." + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "Додати" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "Вилучити" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "З" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

Фільтр активний

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} об’єктів приховано" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "{0} об’єктів пошкоджено" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "

Закрити діалог фільтра, щоб побачити всі об’єкти.

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -6079,37 +5957,37 @@ msgstr "Розширена інформація про об’єкт" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "Введіть координати нової точки" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "Використовувати десяткові градуси" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "Від’ємні значення вказують на Західну/Південну півкулі" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "Будь ласка, введіть правильну широту в діапазоні -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "Введіть широту в діапазоні -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "Будь ласка, введіть правильну довготу в діапазоні -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "Введіть довготу в діапазоні -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "Закрити діалог і створити нову точку" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "Закрити діалог, не створюючи нову точку" @@ -6169,5 +6047,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "Зв’язки" @@ -6215,10 +6093,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "Завантажити з сервер неповних членів вибраних зв’язків" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "Завантажити неповних членів" @@ -6282,14 +6160,14 @@ msgstr "Вибр.: Зв’яз.:{0} / Ліній:{1} / Точок:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "Вибір: {0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "Отримати докладну інформацію про внутрішній стан об’єктів." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "Перевірити" @@ -7007,8 +6885,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -7033,6 +6919,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7415,69 +7299,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "Назва" @@ -8105,5 +7990,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8148,5 +8033,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 msgid "Child Relations" -msgstr "Нащадки зв’язків" +msgstr "Підпорядковані зв’язки" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292 @@ -8787,8 +8672,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "Тип" @@ -8817,6 +8702,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "Невідомо" @@ -9172,5 +9057,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "Виявлено конфлікт" @@ -9760,4 +9645,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -10326,5 +10212,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "Опис" @@ -10377,5 +10263,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -10454,23 +10340,23 @@ "розрахунку часу." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "Шар даних {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "по-за межами завантаженої ділянки" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "версія {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "Увага: спільне використання даних версій 0.6 і 0.5 у версії 0.5" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -10480,51 +10366,11 @@ msgstr[2] "Виявлено {0} конфліктів." -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -"{0} конфлікт був розв’язаний автоматично шляхом очищення " -"{0} об’єкту
з локального набору даних, так як об’єкт вже був вилучений на " -"сервері." -msgstr[1] "" -"{0} конфлікти були розв’язані автоматично шляхом очищення " -"{0} об’єктів
з локального набору даних, так як об’єкти вже були вилучений " -"на сервері." -msgstr[2] "" -"{0} конфліктів було розв’язано автоматично шляхом очищення " -"{0} об’єктів
з локального набору даних, так як об’єкти вже були вилучений " -"на сервері." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "" -"Лишилось розв’язати {0} конфлікт.

Будь ласка, відкрийте діалог списку " -"конфліктів і розв’яжіть конфлікт вручну." -msgstr[1] "" -"Лишилось розв’язати {0} конфлікти.

Будь ласка, відкрийте діалог " -"списку конфліктів і розв’яжіть конфлікти вручну." -msgstr[2] "" -"Лишилось розв’язати {0} конфліктів.

Будь ласка, відкрийте діалог " -"списку конфліктів і розв’яжіть конфлікти вручну." - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "Натисніть, щоб закрити цей діалог і продовжити редагування" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -10534,32 +10380,32 @@ msgstr[2] "{0} вилучено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} складається з:" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "відключено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "Версія API: {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "Перетворити в шар GPX" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "Тест узгодженості набору даних" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "Проблем не виявлено" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "Виявлені наступні проблеми:" @@ -13755,4 +13601,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -15386,5 +15233,5 @@ "об’єкт.

Повідомлення про помилку:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15679,5 +15526,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "Вставка адрес" @@ -16203,36 +16050,37 @@ msgstr "Встановіть ширину будівлі" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "Мультиполігон" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "адреса" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "Створити новий зв’язок" +msgstr "Додати адресу" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "Будівлі" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "Номер" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "Наступне" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "Вулиця" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "Адреси" +msgstr "Ввести адреси" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -16402,11 +16250,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "Відключити обрізку зображень під час гео-прив’язування" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." msgstr "Виберіть перший шар WMS зі списку" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." +msgstr "" #. item "Man Made/Pipeline" combo "Type" @@ -16460,7 +16312,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -16469,13 +16321,13 @@ msgstr "вода" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "символ" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "ділянка" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "номер ділянки" @@ -16523,32 +16375,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "адреса" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "місце знаходження" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "розділ" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "община" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "Увімкнути автоматичне кешування." #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "Макс. розмір кешу (МБ)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -16566,19 +16418,19 @@ "яких даних, створених за допомогою цього втулка." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "WMS французького кадастру" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "" "Значення теґу \"source\", коли включені автоматичні джерела" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "Джерело" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -16587,5 +16439,5 @@ "Замінити оригінальний білий фон на колір фону, заданий у налаштуваннях JOSM." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -16595,62 +16447,62 @@ "Корисно для текстів на темному тлі." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "Дозволити нашарування кількох шарів" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "" "Встановити прозорість шарів WMS. Праворуч — непрозорий, ліворуч — прозорий." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "Показувати прямокутник навколо даних, завантажених з сервера WMS." #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "Роздільна здатність зображення:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "Висока роздільна здатність (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "Середня роздільна здатність (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "Низька роздільна здатність (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "Фільтр інтерполяції зображень:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "Найближчий-Сусід (дуже швидко) [типово]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "Білінійна (швидко)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "Бікубічна (повільно)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "Коефіцієнт захвату векторних зображень:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "Захопити весь екран в одне зображення" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "" @@ -16658,63 +16510,63 @@ "пам’яті)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "Фіксований розмір площі (типово 100 м)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "Фіксований розмір (від 25 до 1000 метрів)" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "Шари:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "Моря, ріки, басейни" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "Будівлі, сховища, підземні споруди." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "Символ, наприклад християнський хрест" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "Ділянки." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "Номера ділянок, назви вулиць." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "Адреси, номери будівель" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "Населений пункт, хутір, селище." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "Розділи і підрозділи кадастру." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "Муніципальні адміністративні кордони." -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "Коефіцієнт захвату растрових зображень:" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "Показати перемички:" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "" @@ -16722,5 +16574,5 @@ "перевищено" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " @@ -16729,4 +16581,8 @@ "Автоматично вибирати перший шар WMS під час захоплення, якщо існує кілька " "шарів." + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 @@ -17048,5 +16904,5 @@ msgstr "Габаритний прямокутник общини: {0}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -17057,14 +16913,14 @@ "Створіть новий." -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "Помилка формату кешу" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "Зона Lambert {0} в кеші не сумісна з поточною зоною Lambert {1}" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "Помилка кешу зони Lambert" @@ -18361,4 +18217,26 @@ msgstr "Тягніть, щоб масштабувати зображення по осі Y" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +#, fuzzy +msgid "Create Stops from GTFS ..." +msgstr "Створити зупинки по GPX…" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +#, fuzzy +msgid "Create Stops from a GTFS file" +msgstr "Створити зупинки з файла GPX" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "Сталася помилка вводу/виводу \"{0}\"" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +#, fuzzy +msgid "GTFS-Stops" +msgstr "Зупинки" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -18400,9 +18278,4 @@ msgid "Create Stops from a GPX file" msgstr "Створити зупинки з файла GPX" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" -msgstr "Сталася помилка вводу/виводу \"{0}\"" #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83 @@ -20015,5 +19888,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "Інше" @@ -20204,5 +20077,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "Мультиполігон" @@ -20727,5 +20600,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "ділянка" @@ -20771,36 +20644,39 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "Немає зображень" - -#. translation note: don't translate quoted words +msgstr "Немає теґів" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "Не з’єднані точки без теґів" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +msgstr "Є теґи, що містять ''fixme'' або ''FIXME''" + +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +msgstr "Є ключі ''note'' або ''comment'' чи ''description''" + +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +msgstr "Є ключ ''created_by'' або ''converted_by''" + +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +msgstr "Є ключ ''watch''" + +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" -msgstr "" +msgstr "Є ключ ''source''" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:62 @@ -20823,7 +20699,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "Лінії без теґів" +msgstr "Лінії без теґів (прокоментовані)" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -21378,5 +21253,5 @@ #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:169 msgid "Overlap tiles" -msgstr "Квадрати, що перетинаються" +msgstr "Зміщення квадратів мапи" #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:170 @@ -21659,7 +21534,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:23 -#, fuzzy msgid "Abort file chooser dialog" -msgstr "Перервати роботу діалогу вибору файлів." +msgstr "Закрити діалогове вікно вибору файла" #. Strings in JFileChooser @@ -21771,7 +21645,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "Відкрити виділений файл." +msgstr "Відкрити обраний файл" #. Strings in JFileChooser @@ -22087,7 +21960,14 @@ msgstr "Втулок для відміни наборів змін" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -22098,10 +21978,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "Надає можливості маршрутизації." #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -22113,5 +21993,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -22122,15 +22002,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "Дозволяє додавати мітки/точки в поточній позиції GPS ." #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "Показує вікно для редагування теґів в табличному вигляді." #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -22143,10 +22023,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "Зробити ряд будинків по вулиці з одного блоку." #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -22158,5 +22038,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -22167,5 +22047,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -22176,10 +22056,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "Дозволяє відновлювати об’єкти, вилучені з бази даних OSM" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -22190,5 +22070,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -22201,5 +22081,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -22210,15 +22090,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "Просте завантаження уздовж довгого набору взаємопов’язаних шляхів" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "Виділити послідовність з’єднаних ліній, що не розгалужуються" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -22229,5 +22109,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -22362,5 +22242,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "Позначення" @@ -22899,5 +22779,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "метал" @@ -22910,5 +22790,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "ліс" @@ -23213,8 +23093,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "так" @@ -23325,8 +23205,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "ні" @@ -23632,5 +23512,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "службова" @@ -23750,5 +23630,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "пішохідна екскурсія" @@ -23897,4 +23777,9 @@ msgid "Edit Motorway Junction" msgstr "Властивості Магістральної розв’язки" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "Номер" #. item "Waypoints/Motorway Junction" text "Number" @@ -23947,13 +23832,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "Оператор" @@ -24221,6 +24106,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "Висота над рівнем моря" @@ -25072,5 +24957,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "Напруга" @@ -25441,24 +25326,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "Години роботи" @@ -25525,23 +25410,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "Цілодобово" @@ -25555,23 +25440,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "Пн-Пт 08:30-20:00" @@ -25585,23 +25470,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "Вт-Сб 08:00-15:00; Нд 08:00-12:00" @@ -25715,6 +25600,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "Номер" @@ -25730,5 +25615,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "підземна" @@ -25742,5 +25627,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "Платна" @@ -25916,5 +25801,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "В інвалідних візках" @@ -25952,5 +25837,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "Навіс" @@ -25958,5 +25843,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "Лавка" @@ -26075,5 +25960,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "Сигнальний вогонь" @@ -26812,5 +26697,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "Спорт" @@ -26885,5 +26770,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -26997,12 +26930,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -27069,12 +26994,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -27088,12 +27005,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -27255,5 +27164,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "спорт" @@ -27280,4 +27190,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "австралійський футбол" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "австралійський футбол" @@ -27305,4 +27221,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "австралійський футбол" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "каное" @@ -27345,6 +27267,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "американський футбол" +#, fuzzy +msgid "gaelic_football" +msgstr "австралійський футбол" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -27385,5 +27308,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "регбі" @@ -27504,6 +27433,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -27517,5 +27450,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -27537,4 +27469,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "тип" @@ -27558,6 +27492,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -27570,5 +27508,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -27590,4 +27527,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "спортивний майданчик" @@ -27610,4 +27549,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "спортивний центр" @@ -27630,4 +27571,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "стадіон" @@ -27650,4 +27593,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "бігова доріжка" @@ -27849,158 +27794,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "Американський футбол" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "Властивості Американського футболу" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "Австралійський футбол" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "Властивості Австралійського футболу" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "Австралійський футбол" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "Властивості Австралійського футболу" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "Властивості Американського футболу" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "Властивості Австралійського футболу" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "Властивості Американського футболу" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "Властивості Американського футболу" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "Властивості Регбі" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "Регбі" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "Властивості Регбі" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "Бейсбол" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "Властивості Бейсболу" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "Баскетбол" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "Властивості Бейсболу" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "Гольф" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "Властивості Гольфу" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "поле для гольфу" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "Боче" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "Властивості боче" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "Боулз" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "Властивості Боулз" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "Крикет" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "Властивості Крикету" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "Тренувальні сітки для крикету" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "Властивості Тренувальних сіток для крикету" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "Крокет" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "Властивості Крокету" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "Хокей" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "Властивості Хокею" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "Пелота" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "Властивості Пелоти" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "Ракетбол" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "Властивості Ракетболу" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "Регбі" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "Властивості Регбі" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "Настільний теніс" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "Властивості Настільного тенісу" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "Теніс" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "Властивості Тенісу" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "Штучного походження" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "Будівля" @@ -28008,5 +27989,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "Громадські будівлі" @@ -28014,10 +27995,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "Властивості Громадської будівлі" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "Міська державна адміністрація" @@ -28025,10 +28006,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "Властивості Міської державної адміністрації" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "Амбасада" @@ -28036,10 +28017,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "Властивості Амбасади" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "Суд" @@ -28048,10 +28029,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "Властивості Суду" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "В’язниця" @@ -28060,10 +28041,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "Властивості В’язниці" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "Поліція/міліція" @@ -28073,10 +28054,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "Властивості Поліції/міліції" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "Пожежна станція" @@ -28085,10 +28066,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "Властивості Пожежного депо" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "Пошта" @@ -28096,5 +28077,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "Властивості Пошти" @@ -28102,15 +28083,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "Дитячий садок" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "Властивості Дитячого саду" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "Школа" @@ -28118,10 +28099,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "Властивості Школи" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "Університет" @@ -28129,10 +28110,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "Властивості Університету" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "Коледж" @@ -28140,5 +28121,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "Властивості коледжу" @@ -28146,5 +28127,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "Кіно" @@ -28153,10 +28134,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "Властивості Кінотеатру" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "Бібліотека" @@ -28165,9 +28146,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "Властивості Бібліотеки" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "Центр мистецтв" @@ -28175,10 +28156,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "Властивості Центру мистецтв" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "Театр" @@ -28187,10 +28168,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "Властивості Театру" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "Культове місце" @@ -28200,5 +28181,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "Властивості Культового місця" @@ -28207,6 +28188,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "Релігія" @@ -28215,66 +28196,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "бахаі" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "буддизм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "християнство" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "індуїзм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "джайнізм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "іудаїзм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "іслам" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "сикхізм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "спіритуалізм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "даосизм" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "уніатство" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "зороастризм" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "Віросповідання" @@ -28283,81 +28264,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "англіканська" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "баптизм" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "католицизм" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "євангелізм" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "свідки ієгови" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "лютеранство" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "методизм" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "мормонство" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "православ’я" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "п’ятидесятники" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "пресвітеріанство" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "протестантизм" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "квакери" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "шиїти" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "суніти" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "Адреси" @@ -28366,5 +28347,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "Властивості Адреси" @@ -28372,5 +28353,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "Номер будинку" @@ -28378,25 +28359,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "Назва будинку" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "Вулиця" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "Назва міста" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "Поштовий індекс" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "Код країни" @@ -28405,5 +28386,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "Властивості Вставки адрес" @@ -28411,61 +28392,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "Схема нумерації" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "непарні" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "парні" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "за абеткою" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "Штучні об’єкти" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "Заводи" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "Властивості Заводів" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "Башта" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "Властивості Башти" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "Тип Башти" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "зв’язку" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "спостереження" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "Висота (в метрах)" @@ -28473,25 +28454,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "Водонапірна вежа" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "Властивості Водонапірної вежі" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "Газгольдер" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "Властивості Газгольдера" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "Маяк" @@ -28499,10 +28480,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "Властивості Маяка" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "Вітряк" @@ -28510,10 +28491,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "Властивості Вітряка" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "Трубопровід" @@ -28522,41 +28503,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "Властивості Трубопроводу" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "газ" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "тепло" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "нафта" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "каналізація" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "іншого призначення" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "Розташування" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "підводне" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "надземне" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "Очисні споруди" @@ -28566,10 +28547,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "Властивості Очисних споруд" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "Кран" @@ -28577,5 +28558,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "Властивості Крану" @@ -28583,10 +28564,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "Властивості Сигнального вогню" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "Геодезичний пункт" @@ -28594,10 +28575,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "Властивості Геодезичного пункту" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "Камера спостереження" @@ -28605,23 +28586,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "Властивості Камери спостереження" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "внутрішня" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "зовнішня" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "загальнодоступне" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "Електростанція" @@ -28631,35 +28612,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "Властивості Електростанції" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "вітряна" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "гідро" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "теплова" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "атомна" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "вугільна" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "сонячна" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "Електропідстанція" @@ -28668,10 +28649,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "Властивості Електропідстанції" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "Трансформаторна будка" @@ -28680,5 +28661,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "Властивості Трансформаторної будки" @@ -28686,10 +28667,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "назва (номер) мережі" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "Опора ЛЕП" @@ -28700,23 +28681,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "Властивості Опори ЛЕП" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "опора" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "стовп" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "Номер опори" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "Лінія електропередач" @@ -28725,74 +28706,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "Властивості Лінії електропередач" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "Тип лінії" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "високовольтна" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "середньої/низької напруги" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "Кількість кабелів" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "Кількість проводів (краще: провідників) на кабель" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "один провід" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "два проводи" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "три проводи" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "чотири проводи" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "Зручності" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "Туалет" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "обмежений" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "Примітка" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "Поштова скринька" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "Телефон" @@ -28801,5 +28782,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "Властивості телефону" @@ -28807,5 +28788,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "Монети" @@ -28813,5 +28794,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "Банкноти" @@ -28819,5 +28800,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "Електронні гаманці та платіжні картки" @@ -28825,5 +28806,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "Дебетові картки" @@ -28831,15 +28812,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "Кредитні картки" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "Телефонні картки" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "Пункт прийому вторинної сировини" @@ -28848,5 +28829,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "Властивості Пункту прийому вторинної сировини" @@ -28854,35 +28835,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "Батарейки/Акумулятори" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "Бляшанки" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "Одяг/Дрантя" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "Скло" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "Папір" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "Металобрухт" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "Урна для сміття" @@ -28890,5 +28871,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "Властивості Урни для сміття" @@ -28897,31 +28878,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "Спинка" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "Матеріал" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "камінь" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "пластик" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "Колір" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "чорний" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "коричневий" @@ -29000,5 +28981,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -29008,31 +28989,31 @@ msgstr "зелений" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "червоний" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "синій" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "сірий" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "білий" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "Кількість місць" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "Мисливська вежа" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "Властивості Мисливської вежі" @@ -29041,30 +29022,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "Висота" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "низька" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "половинна" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "повна" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "Прихована" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "Зачиняється" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "Фонтан" @@ -29073,10 +29054,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "Властивості Фонтану" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "Питна вода" @@ -29085,10 +29066,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "Властивості Питної води" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "Пожежний гідрант" @@ -29097,5 +29078,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "Властивості Пожежного гідранту" @@ -29103,5 +29084,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "Вікно для покинутих немовлят" @@ -29109,15 +29090,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "Властивості Вікна для покинутих немовлят" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "Магазини" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "Автомобільний дилер" @@ -29125,10 +29106,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "Властивості Автомобільного дилера" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "Веломагазин" @@ -29137,28 +29118,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "Властивості Веломагазина" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "Супермаркет" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "Властивості Супермаркету" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "Побутова хімія" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "Властивості Магазину побутової хімії" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "Міні-маркет" @@ -29166,9 +29147,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "Властивості Міні-маркету" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "Кіоск" @@ -29176,27 +29157,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "Властивості Кіоску" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "Книжковий магазин" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "Властивості Книжкового магазину" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "Турагентство" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "Властивості Турагентства" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "М’ясна лавка" @@ -29204,9 +29185,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "Властивості М’ясної лавки" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "Булочна" @@ -29214,9 +29195,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "Властивості Булочної" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "Квітковий магазин" @@ -29224,18 +29205,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "Властивості Квіткового магазину" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "Екологічно чисті продукти" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "Властивості Магазину екологічно чистих проуктів" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "Алкогольні напої" @@ -29243,54 +29224,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "Властивості Магазину алкогольних напоїв" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "Напої" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "Властивості Магазину напоїв" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "Комп’ютери" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "Властивості Комп’ютерної крамниці" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "Електроніка" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "Властивості Магазину побутової електроніки" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Аудіо апаратура" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "Властивості Магазину Аудіо апаратури" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "Меблі" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "Властивості Меблевого магазину" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "Садово-парковий центр" @@ -29298,9 +29279,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "Властивості Магазину садово-паркових товарів" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "Господарські товари" @@ -29308,9 +29289,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "Властивості Магазину господарських товарів" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "Зроби сам" @@ -29318,54 +29299,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "Властивості Магазину «Зроби сам»" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "Канцтовари" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "Властивості Магазину канцтоварів" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "Перукарня" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "Властивості Перукарні" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "Взуття" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "Властивості Магазину взуття" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "Іграшки" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "Властивості Магазину іграшок" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "Відео" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "Властивості Магазину відео" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "Хімчистка" @@ -29373,9 +29354,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "Властивості Хімчистки" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "Пральня" @@ -29383,9 +29364,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "Властивості Пральні" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "Товари для активного відпочинку" @@ -29393,24 +29374,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "Властивості Магазину товарів для активного відпочинку" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "Властивості Магазину спорт-товарів" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "Оптика" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "Властивості Магазину оптики" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "Торговий автомат" @@ -29418,5 +29399,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "Властивості Торгового автомата" @@ -29424,97 +29405,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "Товар" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "квитки на громадський транспорт" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "схеми громадського транспорту" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "талони на паркування" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "продукти харчування" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "напої" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "солодощі" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "сигарети" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "фотографії" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "їжа для тварин" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "газети" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "іграшки" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "марки" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-карти" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "телефонні картки" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "ваучери" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "вело шини" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "презервативи" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "тампони" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "пакети для екскрементів" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "накопичувальні, дисконтні карти" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "Гроші" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "Банк" @@ -29522,14 +29503,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "Властивості Банку" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "Банкомат" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "Обмін валют" @@ -29537,5 +29518,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "Властивості Пункту обміну валют" @@ -29543,15 +29524,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "Властивості Банкомату" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "Медицина" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "Лікар" @@ -29559,18 +29540,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "Властивості Лікаря" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "Стоматологія" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "Властивості Стоматології" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "Аптека" @@ -29578,5 +29559,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "Властивості Аптеки" @@ -29584,9 +29565,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "За рецептом" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "Лікарня" @@ -29594,10 +29575,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "Властивості Лікарні" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "Пункт швидкої допомоги" @@ -29606,5 +29587,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "Властивості Пункту швидкої допомоги" @@ -29613,20 +29594,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "Номер пункту" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "Назва пункту" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "Номер телефону" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(Використовуйте міжнародний код, наприклад: +38-044-1030000)" @@ -29634,5 +29615,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "Ветеринар" @@ -29641,64 +29622,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "Властивості Ветеренарного пункту" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "Географія" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "Місця" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "Континент" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "Властивості Континенту" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "Країна" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "Властивості Країни" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "Штат" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "Властивості Штату" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "Область" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "Властивості Області" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "Район" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "Властивості Району" @@ -29706,15 +29687,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "Місто (понад 100 000)" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "Властивості Міста" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "Місто" @@ -29722,10 +29703,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "Властивості Селища" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "Передмістя" @@ -29733,25 +29714,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "Властивості Передмістя" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "Село" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "Властивості Села" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "Хутір" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "Властивості Хутора" @@ -29759,5 +29740,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "Місцевість" @@ -29765,10 +29746,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "Властивості Місцевості" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "Острів" @@ -29776,10 +29757,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "Властивості Острова" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "Острівець" @@ -29787,5 +29768,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "Властивості Острівця" @@ -29793,5 +29774,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "Вхід до печери" @@ -29799,10 +29780,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "Властивості Входу до печери" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "Вершина" @@ -29810,10 +29791,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "Властивості Вершини" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "Льодовик" @@ -29821,10 +29802,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "Властивості Льодовика" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "Вулкан" @@ -29832,70 +29813,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "Властивості Вулкану" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "Кордони" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "Державний" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "Властивості Державного кордону" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "Адміністративний" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "Властивості Адміністративного кордону" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "Громад" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "Властивості Меж громад" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "Політичні" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "Властивості політичного кордону" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "Національний парк" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "Властивості Кордону національного парку" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "Землекористування" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "Дерево" @@ -29904,15 +29885,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "Властивості Дерева" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "Ботанічна назва" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "Ліс" @@ -29921,5 +29902,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "Властивості Лісу" @@ -29927,17 +29908,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "хвойний" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "листяний" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "мішаний" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "Лісовий масив" @@ -29946,14 +29927,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "Властивості Лісового масиву" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "Заповідник" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "Властивості Заповідника" @@ -29961,25 +29942,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "Осип" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "Властивості Осипи" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "Чагарник" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "Властивості Чагарнику" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "Кам’яниста земля" @@ -29987,10 +29968,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "Властивості Кам’янистої землі" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "Пустир" @@ -29998,5 +29979,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "Властивості Пустиря" @@ -30004,5 +29985,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "Двір ферми" @@ -30011,45 +29992,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "Властивості Двору ферми" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "Сільськогосподарські угіддя" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "Властивості Сільськогосподарських угідь" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "Левада" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "Властивості Левади" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "Виноградник" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "Властивості Виноградників" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "Горо́д" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "Властивості Го́родів" @@ -30057,25 +30038,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "Сад" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "Властивості Садів" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "Газон" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "Властивості Газону" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "Сільський майдан" @@ -30083,10 +30064,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "Властивості Сільського майдану" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "Землі місцевої громади" @@ -30094,20 +30075,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "Властивості Земель місцевої громади" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "Парк" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "Властивості Парку" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "Майданчик для ігор" @@ -30115,5 +30096,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "Властивості Майданчику для ігор" @@ -30121,15 +30102,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "Житлова зона" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "Властивості Житлової зони" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "Цвинтар" @@ -30137,9 +30118,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "Властивості Цвинтаря" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "Кладовище" @@ -30147,39 +30128,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "Властивості Кладовища" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "Роздрібна торгівля" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "Властивості Зони роздрібної торгівлі" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "Діловий район" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "Властивості Ділового району" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "Промзона" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "Властивості Промзони" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "Територія залізниці" @@ -30187,15 +30168,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "Властивості Території залізниці" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "Військова зона" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "Властивості Військової зони" @@ -30203,50 +30184,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "Будівельний майданчик" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "Властивості Будівельного майданчику" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "Очищене місце під забудову" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "Властивості Очищеного місця під забудову" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "Ділянка під нову забудову" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "Властивості Ділянки під нову забудову" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "Звалище" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "Властивості Звалища" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "Кар’єр" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "Властивості Кар’єра" @@ -30256,5 +30237,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "Властивості Мультиполігону" @@ -30266,5 +30247,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "зовнішній сегмент" @@ -30272,5 +30253,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "внутрішній сегмент" @@ -30278,5 +30259,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "Кордони" @@ -30287,5 +30268,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "Властивості Кордонів" @@ -30293,36 +30274,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "Тип Кордону" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "адміністративний" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "національний" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "громади" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "політичний" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "Адміністративний рівень" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "Підпорядкована територія" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "Адміністративний центр" @@ -30330,5 +30311,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "Обмеження на поворот" @@ -30337,5 +30318,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "Властивості Обмеження на поворот" @@ -30343,34 +30324,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "Обмеження" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "поворот ліворуч заборонений" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "поворот праворуч заборонений" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "проїзд заборонений" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "розворот заборонений" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "тільки праворуч" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "тільки ліворуч" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "тільки прямо" @@ -30379,15 +30360,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "з" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "через точку або лінію" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "до" @@ -30395,5 +30376,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "Маршрут" @@ -30402,5 +30383,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "Властивості маршруту" @@ -30408,5 +30389,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "Тип маршруту" @@ -30514,5 +30495,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -30523,17 +30504,17 @@ msgstr "велосипедний" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "автобусний" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "дорога" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "поромний" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "лижний" @@ -30601,5 +30582,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -30609,9 +30590,9 @@ msgstr "піший" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "трамвайний" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "об’їзд" @@ -30625,10 +30606,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "метро" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "Опис символів" @@ -30636,31 +30617,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "Мережа" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "Стан маршруту" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "планований" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "альтернативний" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "тимчасовий" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "з’єднуючий" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "Колір (hex)" @@ -30669,30 +30650,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "відрізок маршруту" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "наступний відрізок" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "попередній відрізок" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "кінцева точка" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "наступна кінцева точка" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "попередня кінцева точка" @@ -30919,5 +30900,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "застарілий" @@ -34245,11 +34226,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "місцевість" @@ -34263,5 +34244,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "дані TIGER" @@ -34616,4 +34597,155 @@ msgid "Sicily - Italy" msgstr "Італія – Сицилія" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "" +#~ "Під час з’єднання з сервером виникла помилка
Подробиці: {0}" + +#~ msgid "Communication with server failed" +#~ msgstr "Збій під час з’єднання з сервером" + +#~ msgid "Yes, undelete them too" +#~ msgstr "Так, відновити їх теж" + +#~ msgid "No, cancel operation" +#~ msgstr "Ні, відмінити дію" + +#~ msgid "" +#~ "There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgid_plural "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" +#~ msgstr[0] "" +#~ "Є {0} додаткова точка, що використовується в лінії {1}
, яку вилучено " +#~ "на сервері.

Ви бажаєте відновити цю точку також?" +#~ msgstr[1] "" +#~ "Є {0} додаткові точки, що використовуються в лінії {1}
, які вилучено " +#~ "на сервері.

Ви бажаєте відновити ці точки також?" +#~ msgstr[2] "" +#~ "Є {0} додаткових точок, що використовуються в лінії {1}
, які вилучено " +#~ "на сервері.

Ви бажаєте відновити ці точки також?" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "Відновити додаткові точки?" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "Є {0} додатковий елемент, що входить до зв’язку {1}
, який вилучено на " +#~ "сервері.

Ви бажаєте відновити його також?" +#~ msgstr[1] "" +#~ "Є {0} додаткових елементи, що входять до зв’язку {1}
, який вилучено " +#~ "на сервері.

Ви бажаєте відновити їх також?" +#~ msgstr[2] "" +#~ "Є {0} додаткових елементів, що входять до зв’язку {1}
, який вилучено " +#~ "на сервері.

Ви бажаєте відновити їх також?" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "Відновити залежні елементи?" + +#~ msgid "Visible State:" +#~ msgstr "Видимий:" + +#~ msgid "visible (on the server)" +#~ msgstr "видимий ( на сервері)" + +#~ msgid "not visible (on the server)" +#~ msgstr "не видимий (на сервері)" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "Лишити клон локальної версії" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "Фізично вилучити з локального набору даних" + +#~ msgid "Keep my visible state" +#~ msgstr "Залишити мій стан \"Видимий\"" + +#~ msgid "Yes, reset the id" +#~ msgstr "Так, перевстановити ідентифікатор" + +#~ msgid "" +#~ "To keep your local version, JOSM
has to reset the id of " +#~ "primitive {0} to 0.
On the next upload the server will assign
it a " +#~ "new id.
Do you agree?" +#~ msgstr "" +#~ "Щоб зберегти свою локальну версію даних, JOSM
скине " +#~ "ідентифікатор елемента {0} на 0.
Під час наступного надсилання даних, " +#~ "сервер призначить
їм новий ідентифікатор.
Ви згодні?" + +#~ msgid "Reset id to 0" +#~ msgstr "Встановити значення ідентифікатора в 0" + +#~ msgid "Keep their visible state" +#~ msgstr "Лишити чужий стан \"Видимий\"" + +#~ msgid "Yes, purge it" +#~ msgstr "Так, очистити" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM вилучить ваш локальний елемент з ідентифікатором {0}
з " +#~ "набору даних.
Ви згодні?" + +#~ msgid "Remove from dataset" +#~ msgstr "Вилучити з набору даних" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "Не розв’язувати конфлікти між станами \"Видимий\"" + +#~ msgid "" +#~ "{0} conflict has been resolved automatically by purging " +#~ "{0} object
from the local dataset because it is deleted on the server." +#~ msgid_plural "" +#~ "{0} conflicts have been resolved automatically by " +#~ "purging {0} objects
from the local dataset because they are deleted " +#~ "on the server." +#~ msgstr[0] "" +#~ "{0} конфлікт був розв’язаний автоматично шляхом очищення " +#~ "{0} об’єкту
з локального набору даних, так як об’єкт вже був вилучений " +#~ "на сервері." +#~ msgstr[1] "" +#~ "{0} конфлікти були розв’язані автоматично шляхом " +#~ "очищення {0} об’єктів
з локального набору даних, так як об’єкти вже " +#~ "були вилучений на сервері." +#~ msgstr[2] "" +#~ "{0} конфліктів було розв’язано автоматично шляхом " +#~ "очищення {0} об’єктів
з локального набору даних, так як об’єкти вже " +#~ "були вилучений на сервері." + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "Лишилось розв’язати {0} конфлікт.

Будь ласка, відкрийте діалог " +#~ "списку конфліктів і розв’яжіть конфлікт вручну." +#~ msgstr[1] "" +#~ "Лишилось розв’язати {0} конфлікти.

Будь ласка, відкрийте діалог " +#~ "списку конфліктів і розв’яжіть конфлікти вручну." +#~ msgstr[2] "" +#~ "Лишилось розв’язати {0} конфліктів.

Будь ласка, відкрийте діалог " +#~ "списку конфліктів і розв’яжіть конфлікти вручну." + +#~ msgid "Create house number and street name relation" +#~ msgstr "Створити зв’язок номеру будинку з вулицею" + +#~ msgid "football" +#~ msgstr "американський футбол" + +#~ msgid "Football" +#~ msgstr "Американський футбол" #~ msgid "Error: {0}" Index: /applications/editors/josm/i18n/po/zh_TW.po =================================================================== --- /applications/editors/josm/i18n/po/zh_TW.po (revision 22208) +++ /applications/editors/josm/i18n/po/zh_TW.po (revision 22209) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-28 17:00+0200\n" -"PO-Revision-Date: 2010-06-23 21:48+0000\n" +"POT-Creation-Date: 2010-07-06 17:43+0200\n" +"PO-Revision-Date: 2010-06-28 15:43+0000\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Traditional Chinese\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2010-06-28 14:55+0000\n" +"X-Launchpad-Export-Date: 2010-07-06 15:06+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: zh_TW\n" @@ -28,5 +28,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:176 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:329 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47 #: build/specialmessages.java:42 @@ -70,5 +70,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:400 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 @@ -78,5 +78,5 @@ #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:828 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:649 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238 @@ -244,5 +244,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:220 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48 @@ -250,6 +250,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:244 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:246 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:997 @@ -335,8 +335,7 @@ msgstr "沒有目標圖層" -#. modal #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:25 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:26 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:121 +#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:35 msgid "Add Node..." msgstr "新增節點" @@ -654,5 +653,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:388 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1019 @@ -1032,5 +1031,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:64 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:65 #: ../plugins/grid/src/grid/GridLayer.java:193 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54 @@ -1039,5 +1038,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:67 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:68 #: ../plugins/grid/src/grid/GridLayer.java:195 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56 @@ -1174,4 +1173,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:24 +#: ../core/src/org/openstreetmap/josm/actions/MoveNodeAction.java:34 msgid "Move Node..." msgstr "移動節點..." @@ -1452,6 +1452,6 @@ #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:309 -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:352 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:329 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:372 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:453 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:464 @@ -1668,6 +1668,4 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java:70 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:221 @@ -2281,5 +2279,5 @@ #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:67 -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29 @@ -2518,10 +2516,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113 msgid "Search..." msgstr "搜尋..." -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112 msgid "Search for objects." msgstr "搜尋物件。" @@ -2529,65 +2527,65 @@ #. -- prepare the combo box with the search expressions #. -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a filter string." msgstr "請輸入過濾條件字串。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137 msgid "Please enter a search string." msgstr "請輸入搜尋字串。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142 msgid "Enter the search expression" msgstr "請輸入搜尋語詞" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:149 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 msgid "replace selection" msgstr "取代選擇區域" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 msgid "add to selection" msgstr "加入至選擇區域" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 msgid "remove from selection" msgstr "從選擇區域移除" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153 msgid "find in selection" msgstr "在選擇區域中尋找" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:159 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 msgid "case sensitive" msgstr "區分大小寫" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:160 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 msgid "all objects" msgstr "所有的物件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:161 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 msgid "Also include incomplete and deleted objects in search." msgstr "搜尋也包含不完整和已刪除的物件。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:162 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163 msgid "regular expression" msgstr "正規表示式" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:178 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 msgid "Baker Street - ''Baker'' and ''Street'' in any key or name." msgstr "Baker Street - 「Baker」和「Street」出現在何設定鍵或名稱中。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 msgid "\"Baker Street\" - ''Baker Street'' in any key or name." msgstr "\"Baker Street\" - 「Baker Street」出現在何設定鍵或名稱中。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 msgid "name:Bak - ''Bak'' anywhere in the name." msgstr "name:Bak - 「Bak」出現在名稱中的任何地方。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 msgid "type=route - key ''type'' with value exactly ''route''." msgstr "type=route - 含有設定鍵「type」為「route」者。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 msgid "" "type=* - key ''type'' with any value. Try also *=value, " @@ -2597,21 +2595,21 @@ "type=、*=*、*=" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 msgid "-name:Bak - not ''Bak'' in the name." msgstr "-name:Bak - 名稱中沒有「Bak」。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 msgid "oneway? - oneway=yes, true, 1 or on" msgstr "是否為單行道？ - oneway=yes, true, 1 或 on" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 msgid "foot: - key=foot set to any value." msgstr "foot: - key=foot 設定為任何數值。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 msgid "Special targets:" msgstr "特殊的目標：" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 msgid "" "type: - type of the object (node, way, relation)" @@ -2620,17 +2618,17 @@ "(relation))" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 msgid "user:... - all objects changed by user" msgstr "使用者：... - 所有由某使用者改變的物件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 msgid "user:anonymous - all objects changed by anonymous users" msgstr "user:anonymous - 所有物件是由匿名使用者所改變的" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 msgid "id:... - object with given ID (0 for new objects)" msgstr "id:... - 以此為 ID 的物件 (0 為新的物件)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 msgid "" "version:... - object with given version (0 objects without an " @@ -2638,5 +2636,5 @@ msgstr "版本：... - 查看這個版本的物件（未指定版本則為 0 個物件）" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 msgid "" "changeset:... - object with given changeset id (0 objects without " @@ -2646,5 +2644,5 @@ "件）" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 msgid "" "nodes:... - object with given number of nodes (nodes:count or nodes:" @@ -2653,5 +2651,5 @@ "節點：... - 有指定數量的節點的物件 (nodes:count 或 nodes:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 msgid "" "tags:... - object with given number of tags (tags:count or tags:min-" @@ -2659,9 +2657,9 @@ msgstr "tags:... - 以此數字為標籤的物件 (tags:count 或 tags:min-max)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 msgid "role:... - object with given role in a relation" msgstr "角色：... - 在關係中指定角色的物件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 msgid "" "timestamp:... - objects with this timestamp (2009-11-" @@ -2671,39 +2669,39 @@ "2009-11-12 或 T14:51 ...)" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 msgid "modified - all changed objects" msgstr "修改過 - 所有改變過的物件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 msgid "selected - all selected objects" msgstr "選取的 - 所有選取的物件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 msgid "incomplete - all incomplete objects" msgstr "不完整 - 所有不完整的物件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 msgid "untagged - all untagged objects" msgstr "未標籤的 - 所有未標籤的物件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 msgid "" "child expr - all children of objects matching the expression" msgstr "child expr - 所有物件的子項符合正規表示式的" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 msgid "" "parent expr - all parents of objects matching the expression" msgstr "parent expr - 所有物件父項符合正規表示式的" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 msgid "Use | or OR to combine with logical or" msgstr "使用 | 或 OR 做邏輯或運算" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 msgid "Use \" to quote operators (e.g. if key contains :)" msgstr "使用 \" 將運算子包起來（例如當鍵值包含 :）" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 msgid "" "Within quoted strings the \" and \\ characters need to be " @@ -2713,12 +2711,12 @@ "\" 和 \\\\)。" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:207 msgid "Use ( and ) to group expressions" msgstr "使用 ( 和 ) 將正規表示式群組起來" #. Strings in JFileChooser -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:48 @@ -2727,38 +2725,51 @@ msgstr "過濾條件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:217 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:298 msgid "Search" msgstr "搜尋" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Submit filter" msgstr "送出過濾條件" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219 msgid "Start Search" msgstr "開始搜尋" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:388 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:231 +#, java-format +msgid "" +"Search expression is not valid: \n" +"\n" +" {0}" +msgstr "" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:232 +#, fuzzy +msgid "Invalid search expression" +msgstr "請輸入搜尋詞句" + +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:408 #, java-format msgid "No match found for ''{0}''" msgstr "找不到「{0}」的符合項" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:410 #, java-format msgid "Nothing added to selection by searching for ''{0}''" msgstr "搜尋「{0}」的結果沒有任何項目可加入選擇區域" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:412 #, java-format msgid "Nothing removed from selection by searching for ''{0}''" msgstr "搜尋「{0}」的結果沒有任何項目可自選擇區域移除" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:394 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:414 #, java-format msgid "Nothing found in selection by searching for ''{0}''" msgstr "在選擇區域中搜尋不到「{0}」" -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:404 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:424 #, java-format msgid "Found {0} matches" @@ -2766,5 +2777,5 @@ #. case sensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:437 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:457 msgctxt "search" msgid "CS" @@ -2772,5 +2783,5 @@ #. case insensitive -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:438 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:458 msgctxt "search" msgid "CI" @@ -2778,5 +2789,5 @@ #. regex search -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:440 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:460 msgctxt "search" msgid "RX" @@ -2784,5 +2795,5 @@ #. all elements -#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:442 +#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:462 msgctxt "search" msgid "A" @@ -2913,8 +2924,8 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:231 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:233 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1165 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:175 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:352 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690 @@ -3054,5 +3065,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:211 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:212 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:84 #, java-format @@ -3175,11 +3186,11 @@ msgstr[0] "移動 {0} 個節點" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:105 -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:123 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:106 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:124 #, java-format msgid "Purged object ''{0}''" msgstr "清理的物件「{0}」" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112 #, java-format msgid "Purged {0} object" @@ -3187,5 +3198,5 @@ msgstr[0] "已清除 {0} 個物件" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:164 #, java-format msgid "" @@ -3194,5 +3205,5 @@ msgstr "警告：將清除路徑 {0}，因為其節點數已低於 2。目前為 {1}" -#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:172 +#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:173 #, java-format msgid "Removing reference from relation {0}" @@ -3229,5 +3240,5 @@ msgstr "解決在關係 {1} 的 {0} 標籤衝突" -#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:64 +#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:65 #, java-format msgid "Undelete {0} primitive" @@ -3541,6 +3552,6 @@ "openstreetmap.de 回報這個情況。這不是嚴重的錯誤，繼續您的工作應是安全的。" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:145 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:183 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:107 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:110 @@ -3550,10 +3561,10 @@ msgstr "缺少 id {0} 路徑的合併目標" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 #, java-format msgid "Missing merge target for object with id {0}" msgstr "缺少 id {0} 物件的合併目標" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:197 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:195 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:117 #, java-format @@ -3561,5 +3572,5 @@ msgstr "缺少 id {0} 節點的合併目標" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:212 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:210 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:144 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:148 @@ -3568,5 +3579,5 @@ msgstr "缺少 id {0} 關係的合併目標" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:217 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:215 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:155 #: ../plugins/ext_tools/src/ext_tools/DataSetToCmd.java:159 @@ -3575,78 +3586,4 @@ msgid "Missing merge target of type {0} with id {1}" msgstr "缺少 id {1} 類型 {0} 的合併目標" - -#. translators notes must be in front -#. column header: enable filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:358 -msgctxt "filter" -msgid "E" -msgstr "E" - -#. column header: hide filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:359 -msgctxt "filter" -msgid "H" -msgstr "H" - -#. column header: filter text -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:360 -msgctxt "filter" -msgid "Text" -msgstr "文字" - -#. column header: inverted filter -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:361 -msgctxt "filter" -msgid "I" -msgstr "I" - -#. column header: filter mode -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:362 -msgctxt "filter" -msgid "M" -msgstr "M" - -#. translators notes must be in front -#. filter mode: replace -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:424 -msgctxt "filter" -msgid "R" -msgstr "R" - -#. filter mode: add -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:425 -msgctxt "filter" -msgid "A" -msgstr "A" - -#. filter mode: remove -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:426 -msgctxt "filter" -msgid "D" -msgstr "D" - -#. filter mode: in selection -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:427 -msgctxt "filter" -msgid "F" -msgstr "F" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:457 -msgid "

Filter active

" -msgstr "

過濾條件已使用

" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:463 -#, java-format -msgid "

{0} objects hidden" -msgstr "

{0} 物件已隱藏" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:471 -#, java-format -msgid "{0} objects disabled" -msgstr "{0} 物件已停用" - -#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:474 -msgid "

Close the filter dialog to see all objects.

" -msgstr "

關閉過濾條件對話盒以查看所有的物件。

" #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:456 @@ -3774,5 +3711,5 @@ #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:174 msgid "background" msgstr "背景" @@ -3898,12 +3835,10 @@ #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:418 -#, fuzzy msgid "UTM France (DOM)" -msgstr "UTM 20N (法國)" +msgstr "" #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:430 -#, fuzzy msgid "UTM Geodesic system" -msgstr "UTM20 北部地理測量系統" +msgstr "" #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55 @@ -3944,5 +3879,5 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:355 -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "railway" msgstr "鐵路" @@ -3963,7 +3898,7 @@ #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:362 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:796 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:797 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:274 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:418 #, java-format msgid "{0} node" @@ -4029,7 +3964,7 @@ #. #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:178 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101 -#: build/trans_style.java:4325 +#: build/trans_style.java:4349 msgid "building" msgstr "建築" @@ -4117,5 +4052,5 @@ #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:489 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46 msgid "Show help information" @@ -4338,5 +4273,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:171 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1064 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179 @@ -4644,12 +4579,12 @@ msgstr "角色 {0} 沒有參與比較配對 {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:104 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "屬性" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:109 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234 @@ -4660,6 +4595,6 @@ msgstr "標籤" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:253 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4667,6 +4602,6 @@ msgstr "節點" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:119 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:248 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 @@ -4674,9 +4609,9 @@ msgstr "成員" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 msgid "No pending tag conflicts to be resolved" msgstr "沒有待解決的標籤衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 #, java-format msgid "Tags({0} conflict)" @@ -4684,5 +4619,5 @@ msgstr[0] "標籤（{0} 衝突）" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4690,26 +4625,26 @@ msgstr[0] "{0} 個標籤衝突等待調解" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 msgid "Nodes(resolved)" msgstr "節點(已解決)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" msgstr "合併的節點清單已凍結。這個路徑的節點清單中沒有待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 msgid "Nodes(with conflicts)" msgstr "節點(有衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Pending conflicts in the node list of this way" msgstr "這個路徑的節點清單中待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 msgid "Members(resolved)" msgstr "成員(已解決)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4717,25 +4652,25 @@ msgstr "合併的節點清單已凍結。這個關係的成員清單中沒有待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 msgid "Members(with conflicts)" msgstr "成員(有衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Pending conflicts in the member list of this relation" msgstr "這個關係的成員清單中待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 msgid "No pending property conflicts" msgstr "沒有待解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 msgid "Properties(with conflicts)" msgstr "屬性(有衝突)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Pending property conflicts to be resolved" msgstr "待解決的屬性衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:284 msgid "Conflict Resolution" msgstr "衝突的決議" @@ -4781,5 +4716,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:81 msgid "My version" msgstr "我的版本" @@ -4790,5 +4725,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" @@ -4802,5 +4737,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "Their version" msgstr "他們的版本" @@ -4869,5 +4804,5 @@ #. Strings in JFileChooser #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 #: build/specialmessages.java:64 msgid "Up" @@ -4879,5 +4814,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Down" msgstr "下" @@ -4973,62 +4908,9 @@ msgstr "合併的節點尚未凍結。不能建置決議指令" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 -#, java-format -msgid "" -"An error occurred while communicating with the server
Details: {0}" -msgstr "與伺服器溝通時發生錯誤
詳細資料：{0}" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468 -msgid "Communication with server failed" -msgstr "與伺服器溝通失敗" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 -msgid "Yes, undelete them too" -msgstr "是的，也取消它們的刪除" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 -msgid "No, cancel operation" -msgstr "不，取消操作" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515 -#, java-format -msgid "" -"There is {0} additional node used by way {1}
which is deleted on the " -"server.

Do you want to undelete this node too?" -msgid_plural "" -"There are {0} additional nodes used by way {1}
which are deleted on the " -"server.

Do you want to undelete these nodes too?" -msgstr[0] "" -"有 {0} 個額外節點用於
在伺服器上刪除的路徑 {1} 。

您是否也想要取消" -"刪除這個節點？" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525 -msgid "Undelete additional nodes?" -msgstr "取消刪除額外的節點？" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549 -#, java-format -msgid "" -"There is {0} additional primitive referred to by relation {1}
which is " -"deleted on the server.

Do you want to undelete this too?" -msgid_plural "" -"There are {0} additional primitives referred to by relation {1}
which are " -"deleted on the server.

Do you want to undelete these too?" -msgstr[0] "" -"有 {0} 個額外原型用於
在伺服器上刪除的關係 {1} 。

您是否也想要取消" -"刪除它？" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559 -msgid "Undelete dependent primitives?" -msgstr "是否取消刪除相依的原型？" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82 msgid "Properties in my dataset, i.e. the local dataset" msgstr "我的資料組合的屬性，例如本地端資料組合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5036,127 +4918,59 @@ msgstr "合併元件的屬性。當合併的決定被接受時它們會取代我的元件中的屬性。" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94 msgid "Properties in their dataset, i.e. the server dataset" msgstr "他們的資料組合的屬性，例如伺服器資料組合" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:110 msgid "Coordinates:" msgstr "坐標：" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:184 msgid "Deleted State:" msgstr "刪除的狀態：" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 -msgid "Visible State:" -msgstr "可視狀態：" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260 msgid "Referenced by:" msgstr "參照於：" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:295 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:307 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:316 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "（沒有）" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:309 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "已刪除" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:311 msgid "not deleted" msgstr "未刪除" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 -msgid "visible (on the server)" -msgstr "可視的（在伺服器上）" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 -msgid "not visible (on the server)" -msgstr "不可視（在伺服器上）" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 -msgid "Keep a clone of the local version" -msgstr "保留本地端版本的複本" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 -msgid "Physically delete from local dataset" -msgstr "實際從本地端資料組合中刪除" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "保留我的坐標" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415 msgid "Keep their coordiates" msgstr "保留他們的坐標" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:430 msgid "Undecide conflict between different coordinates" msgstr "在不同的坐標之間未解決的衝突" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:445 msgid "Keep my deleted state" msgstr "保留我的刪除狀態" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:460 msgid "Keep their deleted state" msgstr "保留他們的刪除狀態" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:475 msgid "Undecide conflict between deleted state" msgstr "已刪除狀態之間未解決的衝突" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 -msgid "Keep my visible state" -msgstr "保留我的可見性狀態" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -msgid "Yes, reset the id" -msgstr "是，重設 id" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 -#, java-format -msgid "" -"To keep your local version, JOSM
has to reset the id of primitive " -"{0} to 0.
On the next upload the server will assign
it a new id.
Do " -"you agree?" -msgstr "" -"要保留您本地端的版本，JOSM
必須將原型 {0} 的 id 重設為 0。
在下次" -"上傳時伺服器會重新
指派新的 id 給它。
您是否同意？" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 -msgid "Reset id to 0" -msgstr "重設 id 為 0" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 -msgid "Keep their visible state" -msgstr "保留他們的可見性" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 -msgid "Yes, purge it" -msgstr "是，清除它" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 -#, java-format -msgid "" -"JOSM will have to remove your local primitive with id {0}
from the " -"dataset.
Do you agree?" -msgstr "" -"JOSM 即將移除您本地資料組合中 id {0}
的原型。
您是否同意？" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 -msgid "Remove from dataset" -msgstr "從資料組合移除" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 -msgid "Undecide conflict between visible state" -msgstr "在可視狀態間有未決定的衝突" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35 @@ -5303,5 +5117,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172 -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "all" msgstr "全部" @@ -5380,7 +5194,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:792 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:793 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:423 #, java-format msgid "{0} way" @@ -5389,6 +5203,6 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:800 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:801 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:428 #, java-format msgid "{0} relation" @@ -5584,5 +5398,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156 @@ -5638,25 +5452,25 @@ msgstr "在地圖上設定選取的元件為上列清單中選取的項目。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:191 msgid "Cancel conflict resolution and close the dialog" msgstr "取消衝突決議並關閉此對話盒" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224 msgid "Apply resolved conflicts and close the dialog" msgstr "接受已解決的衝突並關閉此對話盒" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225 msgid "Apply Resolution" msgstr "套用解決方案" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:237 msgid "Close anyway" msgstr "強制關閉" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238 msgid "Continue resolving" msgstr "繼續解決" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:240 #, java-format msgid "" @@ -5672,22 +5486,22 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:248 msgid "Conflict not resolved completely" msgstr "衝突尚未完全調解" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:281 msgid "Resolve conflicts" msgstr "解決衝突" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:283 #, java-format msgid "Resolve conflicts for ''{0}''" msgstr "調解「{0}」的衝突" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:54 msgid "Filter objects and hide/disable them." msgstr "過濾物件並隱藏/停用它們。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1052 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125 @@ -5700,44 +5514,123 @@ msgstr "加入" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:76 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75 msgid "Add filter." msgstr "加入過濾條件。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:88 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:86 msgid "Edit filter." msgstr "編輯過濾條件。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:100 msgid "Delete filter." msgstr "刪除過濾條件。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:113 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:110 msgid "Move filter up." msgstr "將過濾條件上移。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:124 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:121 msgid "Move filter down." msgstr "將過濾條件下移。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:135 msgid "Enable filter" msgstr "啟用過濾條件" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:136 msgid "Hide elements" msgstr "隱藏元素" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138 msgid "Inverse filter" msgstr "反轉過濾條件" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:139 msgid "Filter mode" msgstr "過濾條件模式" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:213 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:210 #, java-format msgid "Filter Hidden:{0} Disabled:{1}" msgstr "過濾隱藏：{0} 停用：{1}" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:55 +#, fuzzy +msgid "Error in filter" +msgstr "載入檔案有錯誤" + +#. translators notes must be in front +#. column header: enable filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:191 +msgctxt "filter" +msgid "E" +msgstr "E" + +#. column header: hide filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:192 +msgctxt "filter" +msgid "H" +msgstr "H" + +#. column header: filter text +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:193 +msgctxt "filter" +msgid "Text" +msgstr "文字" + +#. column header: inverted filter +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:194 +msgctxt "filter" +msgid "I" +msgstr "I" + +#. column header: filter mode +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:195 +msgctxt "filter" +msgid "M" +msgstr "M" + +#. translators notes must be in front +#. filter mode: replace +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:264 +msgctxt "filter" +msgid "R" +msgstr "R" + +#. filter mode: add +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:266 +msgctxt "filter" +msgid "A" +msgstr "A" + +#. filter mode: remove +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:268 +msgctxt "filter" +msgid "D" +msgstr "D" + +#. filter mode: in selection +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:270 +msgctxt "filter" +msgid "F" +msgstr "F" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:300 +msgid "

Filter active

" +msgstr "

過濾條件已使用

" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:306 +#, java-format +msgid "

{0} objects hidden" +msgstr "

{0} 物件已隱藏" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:314 +#, java-format +msgid "{0} objects disabled" +msgstr "{0} 物件已停用" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java:317 +msgid "

Close the filter dialog to see all objects.

" +msgstr "

關閉過濾條件對話盒以查看所有的物件。

" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69 @@ -5779,37 +5672,37 @@ msgstr "進階的物件資訊" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:59 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 msgid "Enter the coordinates for the new node." msgstr "輸入新節點的座標" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:60 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 msgid "Use decimal degrees." msgstr "使用十進位度數" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:61 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:62 msgid "Negative values denote Western/Southern hemisphere." msgstr "負數表示西半球/南半球" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:183 msgid "Please enter a valid latitude in the range -90..90" msgstr "請輸入有效的緯度範圍 -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:184 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:186 msgid "Please enter a latitude in the range -90..90" msgstr "請輸入緯度範圍 -90..90" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:192 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:194 msgid "Please enter a valid longitude in the range -180..180" msgstr "請輸入有效的經度範圍 -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:195 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:197 msgid "Please enter a longitude in the range -180..180" msgstr "請輸入經度範圍 -180..180" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:232 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:234 msgid "Close the dialog and create a new node" msgstr "關閉此對話盒並建立新的節點" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:245 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java:247 msgid "Close the dialog, do not create a new node" msgstr "關閉此對話盒，不要建立新的節點" @@ -5869,5 +5762,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768 -#: build/trans_presets.java:3188 +#: build/trans_presets.java:3206 msgid "Relations" msgstr "關係" @@ -5915,10 +5808,10 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:845 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:846 msgid "Download incomplete members of selected relations" msgstr "下載已選取關係的不完整成員" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:847 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:848 msgid "Download incomplete members" msgstr "下載不完整的成員" @@ -5982,14 +5875,14 @@ msgstr "Sel.: Rel.:{0} / 路徑:{1} / 節點:{2}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:810 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:811 #, java-format msgid "Selection: {0}" msgstr "選擇區域：{0}" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:882 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 msgid "Get detailed information on the internal state of the objects." msgstr "取得物件內部狀態的詳細資訊。" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:884 msgid "Inspect" msgstr "檢查" @@ -6690,8 +6583,16 @@ #. item "Sport (Ball)/Soccer" label "Edit Soccer" #. -#. item "Sport (Ball)/Football" label "Edit Football" -#. #. item "Sport (Ball)/Australian Football" label "Edit Australian Football" #. +#. item "Sport (Ball)/American Football" label "Edit American Football" +#. +#. item "Sport (Ball)/Canadian Football" label "Edit Canadian Football" +#. +#. item "Sport (Ball)/Gaelic Football" label "Edit Gaelic Football" +#. +#. item "Sport (Ball)/Rugby League" label "Edit Rugby League" +#. +#. item "Sport (Ball)/Rugby Union" label "Edit Rugby Union" +#. #. item "Sport (Ball)/Baseball" label "Edit Baseball" #. @@ -6716,6 +6617,4 @@ #. item "Sport (Ball)/Racquet" label "Edit Racquet" #. -#. item "Sport (Ball)/Rugby" label "Edit Rugby" -#. #. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis" #. @@ -7098,69 +6997,70 @@ #: build/trans_presets.java:2139 build/trans_presets.java:2145 #: build/trans_presets.java:2151 build/trans_presets.java:2157 -#: build/trans_presets.java:2163 build/trans_presets.java:2177 -#: build/trans_presets.java:2183 build/trans_presets.java:2189 -#: build/trans_presets.java:2196 build/trans_presets.java:2203 -#: build/trans_presets.java:2211 build/trans_presets.java:2218 -#: build/trans_presets.java:2224 build/trans_presets.java:2231 -#: build/trans_presets.java:2237 build/trans_presets.java:2243 -#: build/trans_presets.java:2249 build/trans_presets.java:2257 -#: build/trans_presets.java:2264 build/trans_presets.java:2271 -#: build/trans_presets.java:2278 build/trans_presets.java:2286 -#: build/trans_presets.java:2318 build/trans_presets.java:2323 -#: build/trans_presets.java:2333 build/trans_presets.java:2338 -#: build/trans_presets.java:2344 build/trans_presets.java:2350 -#: build/trans_presets.java:2367 build/trans_presets.java:2373 -#: build/trans_presets.java:2379 build/trans_presets.java:2385 -#: build/trans_presets.java:2391 build/trans_presets.java:2402 -#: build/trans_presets.java:2409 build/trans_presets.java:2510 -#: build/trans_presets.java:2517 build/trans_presets.java:2538 -#: build/trans_presets.java:2546 build/trans_presets.java:2551 -#: build/trans_presets.java:2557 build/trans_presets.java:2564 -#: build/trans_presets.java:2571 build/trans_presets.java:2577 -#: build/trans_presets.java:2583 build/trans_presets.java:2590 -#: build/trans_presets.java:2597 build/trans_presets.java:2604 -#: build/trans_presets.java:2610 build/trans_presets.java:2617 -#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2163 build/trans_presets.java:2169 +#: build/trans_presets.java:2175 build/trans_presets.java:2181 +#: build/trans_presets.java:2195 build/trans_presets.java:2201 +#: build/trans_presets.java:2207 build/trans_presets.java:2214 +#: build/trans_presets.java:2221 build/trans_presets.java:2229 +#: build/trans_presets.java:2236 build/trans_presets.java:2242 +#: build/trans_presets.java:2249 build/trans_presets.java:2255 +#: build/trans_presets.java:2261 build/trans_presets.java:2267 +#: build/trans_presets.java:2275 build/trans_presets.java:2282 +#: build/trans_presets.java:2289 build/trans_presets.java:2296 +#: build/trans_presets.java:2304 build/trans_presets.java:2336 +#: build/trans_presets.java:2341 build/trans_presets.java:2351 +#: build/trans_presets.java:2356 build/trans_presets.java:2362 +#: build/trans_presets.java:2368 build/trans_presets.java:2385 +#: build/trans_presets.java:2391 build/trans_presets.java:2397 +#: build/trans_presets.java:2403 build/trans_presets.java:2409 +#: build/trans_presets.java:2420 build/trans_presets.java:2427 +#: build/trans_presets.java:2528 build/trans_presets.java:2535 +#: build/trans_presets.java:2556 build/trans_presets.java:2564 +#: build/trans_presets.java:2569 build/trans_presets.java:2575 +#: build/trans_presets.java:2582 build/trans_presets.java:2589 +#: build/trans_presets.java:2595 build/trans_presets.java:2601 +#: build/trans_presets.java:2608 build/trans_presets.java:2615 +#: build/trans_presets.java:2622 build/trans_presets.java:2628 #: build/trans_presets.java:2635 build/trans_presets.java:2641 -#: build/trans_presets.java:2647 build/trans_presets.java:2654 -#: build/trans_presets.java:2661 build/trans_presets.java:2668 -#: build/trans_presets.java:2674 build/trans_presets.java:2680 +#: build/trans_presets.java:2647 build/trans_presets.java:2653 +#: build/trans_presets.java:2659 build/trans_presets.java:2665 +#: build/trans_presets.java:2672 build/trans_presets.java:2679 #: build/trans_presets.java:2686 build/trans_presets.java:2692 -#: build/trans_presets.java:2698 build/trans_presets.java:2705 -#: build/trans_presets.java:2712 build/trans_presets.java:2719 -#: build/trans_presets.java:2725 build/trans_presets.java:2731 -#: build/trans_presets.java:2756 build/trans_presets.java:2765 -#: build/trans_presets.java:2780 build/trans_presets.java:2786 -#: build/trans_presets.java:2794 build/trans_presets.java:2801 -#: build/trans_presets.java:2821 build/trans_presets.java:2832 -#: build/trans_presets.java:2838 build/trans_presets.java:2844 +#: build/trans_presets.java:2698 build/trans_presets.java:2704 +#: build/trans_presets.java:2710 build/trans_presets.java:2716 +#: build/trans_presets.java:2723 build/trans_presets.java:2730 +#: build/trans_presets.java:2737 build/trans_presets.java:2743 +#: build/trans_presets.java:2749 build/trans_presets.java:2774 +#: build/trans_presets.java:2783 build/trans_presets.java:2798 +#: build/trans_presets.java:2804 build/trans_presets.java:2812 +#: build/trans_presets.java:2819 build/trans_presets.java:2839 #: build/trans_presets.java:2850 build/trans_presets.java:2856 -#: build/trans_presets.java:2863 build/trans_presets.java:2870 -#: build/trans_presets.java:2877 build/trans_presets.java:2883 -#: build/trans_presets.java:2889 build/trans_presets.java:2897 -#: build/trans_presets.java:2904 build/trans_presets.java:2911 -#: build/trans_presets.java:2918 build/trans_presets.java:2924 -#: build/trans_presets.java:2931 build/trans_presets.java:2938 -#: build/trans_presets.java:2947 build/trans_presets.java:2953 -#: build/trans_presets.java:2959 build/trans_presets.java:2965 -#: build/trans_presets.java:2971 build/trans_presets.java:2980 -#: build/trans_presets.java:2990 build/trans_presets.java:2999 -#: build/trans_presets.java:3005 build/trans_presets.java:3011 -#: build/trans_presets.java:3016 build/trans_presets.java:3022 -#: build/trans_presets.java:3028 build/trans_presets.java:3037 -#: build/trans_presets.java:3043 build/trans_presets.java:3049 +#: build/trans_presets.java:2862 build/trans_presets.java:2868 +#: build/trans_presets.java:2874 build/trans_presets.java:2881 +#: build/trans_presets.java:2888 build/trans_presets.java:2895 +#: build/trans_presets.java:2901 build/trans_presets.java:2907 +#: build/trans_presets.java:2915 build/trans_presets.java:2922 +#: build/trans_presets.java:2929 build/trans_presets.java:2936 +#: build/trans_presets.java:2942 build/trans_presets.java:2949 +#: build/trans_presets.java:2956 build/trans_presets.java:2965 +#: build/trans_presets.java:2971 build/trans_presets.java:2977 +#: build/trans_presets.java:2983 build/trans_presets.java:2989 +#: build/trans_presets.java:2998 build/trans_presets.java:3008 +#: build/trans_presets.java:3017 build/trans_presets.java:3023 +#: build/trans_presets.java:3029 build/trans_presets.java:3034 +#: build/trans_presets.java:3040 build/trans_presets.java:3046 #: build/trans_presets.java:3055 build/trans_presets.java:3061 #: build/trans_presets.java:3067 build/trans_presets.java:3073 -#: build/trans_presets.java:3080 build/trans_presets.java:3086 +#: build/trans_presets.java:3079 build/trans_presets.java:3085 #: build/trans_presets.java:3091 build/trans_presets.java:3098 -#: build/trans_presets.java:3105 build/trans_presets.java:3111 -#: build/trans_presets.java:3120 build/trans_presets.java:3128 -#: build/trans_presets.java:3134 build/trans_presets.java:3140 -#: build/trans_presets.java:3147 build/trans_presets.java:3153 -#: build/trans_presets.java:3160 build/trans_presets.java:3166 -#: build/trans_presets.java:3172 build/trans_presets.java:3178 -#: build/trans_presets.java:3184 build/trans_presets.java:3196 -#: build/trans_presets.java:3210 build/trans_presets.java:3229 -#: build/trans_presets.java:3243 +#: build/trans_presets.java:3104 build/trans_presets.java:3109 +#: build/trans_presets.java:3116 build/trans_presets.java:3123 +#: build/trans_presets.java:3129 build/trans_presets.java:3138 +#: build/trans_presets.java:3146 build/trans_presets.java:3152 +#: build/trans_presets.java:3158 build/trans_presets.java:3165 +#: build/trans_presets.java:3171 build/trans_presets.java:3178 +#: build/trans_presets.java:3184 build/trans_presets.java:3190 +#: build/trans_presets.java:3196 build/trans_presets.java:3202 +#: build/trans_presets.java:3214 build/trans_presets.java:3228 +#: build/trans_presets.java:3247 build/trans_presets.java:3261 msgid "Name" msgstr "名稱" @@ -7753,5 +7653,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:140 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109 #, java-format @@ -8403,8 +8303,8 @@ #: build/trans_presets.java:669 build/trans_presets.java:678 #: build/trans_presets.java:1041 build/trans_presets.java:1368 -#: build/trans_presets.java:2358 build/trans_presets.java:2392 -#: build/trans_presets.java:2401 build/trans_presets.java:2427 -#: build/trans_presets.java:2981 build/trans_presets.java:2991 -#: build/trans_presets.java:3000 +#: build/trans_presets.java:2376 build/trans_presets.java:2410 +#: build/trans_presets.java:2419 build/trans_presets.java:2445 +#: build/trans_presets.java:2999 build/trans_presets.java:3009 +#: build/trans_presets.java:3018 msgid "Type" msgstr "類型" @@ -8433,6 +8333,6 @@ #: build/trans_presets.java:669 build/trans_presets.java:1278 #: build/trans_presets.java:1373 build/trans_presets.java:1374 -#: build/trans_presets.java:1375 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 +#: build/trans_presets.java:1375 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 msgid "unknown" msgstr "不明" @@ -8770,5 +8670,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:361 msgid "Conflicts detected" msgstr "選取的衝突" @@ -9302,4 +9202,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120 +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:83 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85 msgid "Settings" @@ -9816,5 +9717,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:392 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143 -#: build/trans_presets.java:3246 +#: build/trans_presets.java:3264 msgid "Description" msgstr "描述" @@ -9863,5 +9764,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:850 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:539 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:150 @@ -9935,23 +9836,23 @@ msgstr "部分航點離軌跡太遠而無法明顯判斷其時刻者會被忽略。" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:117 #, java-format msgid "Data Layer {0}" msgstr "資料圖層 {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "outside downloaded area" msgstr "超出下載的區域" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:278 #, java-format msgid "version {0}" msgstr "版本 {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:316 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5" msgstr "警告：混合 0.6 和 0.5 資料會成為 0.5 版" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:341 #, java-format msgid "There was {0} conflict detected." @@ -9959,34 +9860,11 @@ msgstr[0] "偵測到 {0} 個衝突。" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356 -#, java-format -msgid "" -"{0} conflict has been resolved automatically by purging {0} " -"object
from the local dataset because it is deleted on the server." -msgid_plural "" -"{0} conflicts have been resolved automatically by purging " -"{0} objects
from the local dataset because they are deleted on the " -"server." -msgstr[0] "" -"{0} 衝突已經以清除本地資料組合 {0} 物件的方式自動調解
" -"了。因為它已經從伺服器上刪除了。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365 -#, java-format -msgid "" -"{0} conflict remains to be resolved.

Please open the Conflict List " -"Dialog and manually resolve it." -msgid_plural "" -"{0} conflicts remain to be resolved.

Please open the Conflict List " -"Dialog and manually resolve them." -msgstr[0] "還有 {0} 個衝突待調解。

請開啟衝突清單對話盒並手動調解它。" - -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:354 msgid "Click to close this dialog and continue editing" msgstr "按這裡關閉這個對話盒並繼續編輯" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500 -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:420 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:425 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:430 #, java-format msgid "{0} deleted" @@ -9994,32 +9872,32 @@ msgstr[0] "{0} 已刪除" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:433 #, java-format msgid "{0} consists of:" msgstr "{0} 組成：" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 msgid "unset" msgstr "取消設定" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:437 #, java-format msgid "API version: {0}" msgstr "API 版本： {0}" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:536 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:147 msgid "Convert to GPX layer" msgstr "轉換為 GPX 圖層" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:634 msgid "Dataset consistency test" msgstr "資料組合一致性測試" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:640 msgid "No problems found" msgstr "沒有發現問題" -#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718 +#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:643 msgid "Following problems found:" msgstr "發現下列問題：" @@ -13011,4 +12889,5 @@ #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:199 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220 #, java-format @@ -14525,5 +14404,5 @@ "

錯誤的訊息為：
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:441 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:442 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -14798,5 +14677,5 @@ #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196 -#: build/trans_presets.java:2306 +#: build/trans_presets.java:2324 msgid "Address Interpolation" msgstr "" @@ -15290,36 +15169,37 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:62 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:83 #, fuzzy +msgid "on polygon" +msgstr "多重多邊形" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:95 msgid "Add address" -msgstr "住址" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:63 -#, fuzzy -msgid "Create house number and street name relation" -msgstr "建立新的關係" +msgstr "" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:96 +msgid "Helping tool for tag address" +msgstr "" #. group "Man-Made" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:64 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:97 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102 -#: build/trans_presets.java:2169 +#: build/trans_presets.java:2187 msgid "Buildings" msgstr "建築物" -#. item "Waypoints/Motorway Junction" text "Name" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:72 -#: build/trans_presets.java:637 -msgid "Number" -msgstr "編號" - -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:403 +#, fuzzy +msgid "Next no" +msgstr "下一幅" + +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:404 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:155 msgid "Street" msgstr "街" -#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:101 -#, fuzzy +#: ../plugins/cadastre-fr/src/cadastre_fr/Address.java:445 msgid "Enter addresses" -msgstr "地址" +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100 @@ -15487,11 +15367,15 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:288 msgid "Disable image cropping during georeferencing." msgstr "在進行地理參照時停用圖片剪裁。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:43 msgid "Select first WMS layer in list." msgstr "先在清單中選取一個 WMS 圖層。" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:45 +msgid "Don't use relation for addresses (but \"addr:street\" on nodes)." +msgstr "" #. item "Man Made/Pipeline" combo "Type" @@ -15545,7 +15429,7 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23 -#: build/trans_presets.java:2358 build/trans_style.java:1018 +#: build/trans_presets.java:2376 build/trans_style.java:1018 #: build/trans_style.java:1035 build/trans_style.java:1051 #: build/trans_style.java:1058 build/trans_style.java:3525 @@ -15554,13 +15438,13 @@ msgstr "水域" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 msgid "symbol" msgstr "符號" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 msgid "parcel" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 msgid "parcel number" msgstr "地號" @@ -15608,32 +15492,32 @@ #. #. -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72 -#: build/trans_style.java:4353 build/trans_style.java:4360 -#: build/trans_style.java:4367 build/trans_style.java:4374 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: build/trans_style.java:4377 build/trans_style.java:4384 +#: build/trans_style.java:4391 build/trans_style.java:4398 msgid "address" msgstr "住址" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 msgid "locality" msgstr "所在地" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:76 msgid "section" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77 msgid "commune" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82 msgid "Enable automatic caching." msgstr "啟用自動快取。" #. disabled by default -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:85 msgid "Max. cache size (in MB)" msgstr "最大快取容量 (MB)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95 msgid "" "A special handler of the French cadastre wms at www.cadastre.gouv." @@ -15645,18 +15529,18 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:100 msgid "French cadastre WMS" msgstr "法國 cadastre WMS" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:107 msgid "Value of key \"source\" when autosourcing is enabled" msgstr "當自動來源啓用時設定鍵「source」的數值" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108 msgid "Source" msgstr "來源" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:114 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:319 msgid "" "Replace the original white background by the backgound color defined in JOSM " @@ -15664,5 +15548,5 @@ msgstr "將原始的白色背景以在 JOSM 偏好設定中定義的背景顏色取代。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119 msgid "" "Invert the original black and white colors (and all intermediate greys). " @@ -15670,131 +15554,135 @@ msgstr "反轉原始的黑色與白色（和所有中間的灰色）。當文字在暗色背景中時很有用。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 msgid "Allows multiple layers stacking" msgstr "允許多重圖層堆疊" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134 msgid "Set WMS layers transparency. Right is opaque, left is transparent." msgstr "設定 WMS 圖層透明度。右邊是不透明，左邊是透明。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145 msgid "Draw a rectangle around downloaded data from WMS server." msgstr "在從 WMS 伺服器下載的資料周圍繪出一個矩形。" #. option to select the single grabbed image resolution -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149 msgid "Image resolution:" msgstr "圖片解析度：" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 msgid "High resolution (1000x800)" msgstr "高解析度 (1000x800)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 msgid "Medium resolution (800x600)" msgstr "中解析度 (800x600)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:163 msgid "Low resolution (600x400)" msgstr "低解析度 (600x400)" #. option to select image zooming interpolation method -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 msgid "Image filter interpolation:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 msgid "Nearest-Neighbor (fastest) [ Default ]" msgstr "最鄰近 (最快) [預設值]" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:182 msgid "Bilinear (fast)" msgstr "雙線性 (快速)" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183 msgid "Bicubic (slow)" msgstr "雙立體 (慢速)" #. the vectorized images multiplier -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:197 msgid "Vector images grab multiplier:" msgstr "向量圖片抓取倍數：" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:209 msgid "Grab one image full screen" msgstr "抓取一張全螢幕圖片" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211 -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:213 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217 msgid "Grab smaller images (higher quality but use more memory)" msgstr "抓取較小的圖片（較高的品質但消耗更多記憶體）" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:221 msgid "Fixed size square (default is 100m)" msgstr "固定大小矩形（預設為 100m）" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:241 msgid "Fixed size (from 25 to 1000 meters)" msgstr "固定大小（從 25 到 100 公尺）" #. WMS layers selection -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:246 msgid "Layers:" msgstr "圖層：" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:249 msgid "See, rivers, swimming pools." msgstr "海、河流、游泳池。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:252 msgid "Buildings, covers, underground constructions." msgstr "建築、遮蔽物、地下建築物。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:255 msgid "Symbols like cristian cross." msgstr "符號，像十字架之類。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:258 msgid "Parcels." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:261 msgid "Parcels numbers, street names." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:264 msgid "Address, houses numbers." msgstr "地址、門牌號碼" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:267 msgid "Locality, hamlet, place." msgstr "所在地、村莊、位置。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:270 msgid "Cadastral sections and subsections." msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:273 msgid "Municipality administrative borders." msgstr "自治行政區邊界。" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:281 msgid "Raster images grab multiplier:" msgstr "點陣圖片抓取倍數：" #. the crosspiece display -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:291 msgid "Display crosspieces:" msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:325 msgid "Oldest files are automatically deleted when this size is exceeded" msgstr "當超過這個大小時較舊的檔案會自動刪除" -#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329 +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:334 msgid "" "Automatically selects the first WMS layer if multiple layers exist when " "grabbing." msgstr "如果抓取時有多個圖層則自動選擇第一個 WMS 圖層。" + +#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:342 +msgid "Enable this to use the tag \"add:street\" on nodes." +msgstr "" #: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81 @@ -16109,5 +15997,5 @@ msgstr "" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:486 #, java-format msgid "" @@ -16118,14 +16006,14 @@ "建立一個新的。" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:487 msgid "Cache Format Error" msgstr "快取格式錯誤" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 #, java-format msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}" msgstr "快取中的蘭勃特區 {0} 與目前的蘭勃特區 {1} 不相容" -#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511 +#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:513 msgid "Cache Lambert Zone Error" msgstr "快取蘭勃特區發生錯誤" @@ -17397,4 +17285,23 @@ msgstr "拖曳以縮放相片的 Y 軸" +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:75 +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:110 +msgid "Create Stops from GTFS ..." +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:76 +msgid "Create Stops from a GTFS file" +msgstr "" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterAction.java:204 +#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 +#, java-format +msgid "IOException \"{0}\" occurred" +msgstr "發生 IOException「{0}」" + +#: ../plugins/public_transport/src/public_transport/GTFSImporterDialog.java:85 +msgid "GTFS-Stops" +msgstr "" + #. item "Bicycle/Rental" text "Name" #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39 @@ -17436,9 +17343,4 @@ msgid "Create Stops from a GPX file" msgstr "" - -#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230 -#, java-format -msgid "IOException \"{0}\" occurred" -msgstr "發生 IOException「{0}」" #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83 @@ -18967,5 +18869,5 @@ #. * Other messages #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:105 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:110 msgid "Other" msgstr "其他" @@ -19151,5 +19053,5 @@ #. group "Relations" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:49 -#: build/trans_presets.java:3189 +#: build/trans_presets.java:3207 msgid "Multipolygon" msgstr "多重多邊形" @@ -19672,5 +19574,5 @@ #. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104 -#: build/trans_style.java:4332 +#: build/trans_style.java:4356 msgid "area" msgstr "區域" @@ -19713,34 +19615,37 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:68 -#, fuzzy msgid "No tags" -msgstr "沒有資料" - -#. translation note: don't translate quoted words +msgstr "" + #. Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future. #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:69 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:78 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:103 +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:109 +msgid "Unconnected nodes without physical tags" +msgstr "" + +#. translation note: don't translate quoted words #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:77 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:98 -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:104 -msgid "Unconnected nodes without physical tags" -msgstr "" - -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:76 msgid "Has tag containing ''fixme'' or ''FIXME''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:85 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:87 msgid "Has key ''note'' or ''comment'' or ''description''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 msgid "Has key ''created_by'' or ''converted_by''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:91 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:95 msgid "Has key ''watch''" msgstr "" -#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:94 +#. translation note: don't translate quoted words +#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:99 msgid "Has key ''source''" msgstr "" @@ -19763,7 +19668,6 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:104 -#, fuzzy msgid "Untagged ways (commented)" -msgstr "未加標籤的路徑" +msgstr "" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106 @@ -20575,7 +20479,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:23 -#, fuzzy msgid "Abort file chooser dialog" -msgstr "中止檔案選擇對話盒。" +msgstr "" #. Strings in JFileChooser @@ -20687,7 +20590,6 @@ #. Strings in JFileChooser #: build/specialmessages.java:52 -#, fuzzy msgid "Open selected file" -msgstr "開啟選取的檔案。" +msgstr "" #. Strings in JFileChooser @@ -20981,7 +20883,14 @@ msgstr "還原變更組合的外掛程式" -#. File ../plugins/roadsigns/build.xml had no data +#. Plugin RoadSigns +#: build/trans_plugins.java:68 +msgid "" +"Plugin for tagging of objects based on a selection of road signs. The dialog " +"can be opened by clicking a small icon in the upper right corner of the " +"properties window. Available country presets: Germany." +msgstr "" + #. Plugin routes -#: build/trans_plugins.java:69 +#: build/trans_plugins.java:70 msgid "" "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be " @@ -20992,10 +20901,10 @@ #. Plugin routing -#: build/trans_plugins.java:71 +#: build/trans_plugins.java:72 msgid "Provides routing capabilities." msgstr "提供路線規畫的功能。" #. Plugin SimplifyArea -#: build/trans_plugins.java:73 +#: build/trans_plugins.java:74 msgid "" "Simplify area by removing nodes on very obtuse angles. This can be " @@ -21004,5 +20913,5 @@ #. Plugin slippymap -#: build/trans_plugins.java:75 +#: build/trans_plugins.java:76 msgid "" "Displays a slippy map grid in JOSM. Can load tiles from slippy map as " @@ -21012,15 +20921,15 @@ #. Plugin surveyor -#: build/trans_plugins.java:77 +#: build/trans_plugins.java:78 msgid "Allow adding markers/nodes on current gps positions." msgstr "允許在目前的 gps 位置加入標記/節點。" #. Plugin tageditor -#: build/trans_plugins.java:79 +#: build/trans_plugins.java:80 msgid "Provides a dialog for editing tags in a tabular grid." msgstr "提供在表格線中編輯標籤的對話盒。" #. Plugin tagging-preset-tester -#: build/trans_plugins.java:81 +#: build/trans_plugins.java:82 msgid "" "Adds a tagging preset tester to the help menu, which helps you developing of " @@ -21032,10 +20941,10 @@ #. Plugin terracer -#: build/trans_plugins.java:83 +#: build/trans_plugins.java:84 msgid "Make terraced houses out of single blocks." msgstr "讓連棟房屋能超出單一區塊。" #. Plugin touchscreenhelper -#: build/trans_plugins.java:85 +#: build/trans_plugins.java:86 msgid "" "Provides helper buttons to allow working with single button mouse (stylus). " @@ -21044,5 +20953,5 @@ #. Plugin Tracer -#: build/trans_plugins.java:87 +#: build/trans_plugins.java:88 msgid "" "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) " @@ -21051,5 +20960,5 @@ #. Plugin turnrestrictions -#: build/trans_plugins.java:89 +#: build/trans_plugins.java:90 msgid "" "The turnrestrictions plugin allows to enter maintain information about turn " @@ -21060,10 +20969,10 @@ #. Plugin undelete -#: build/trans_plugins.java:91 +#: build/trans_plugins.java:92 msgid "Allows undeleting object from OSM database" msgstr "允許從 OSM 資料庫中取消物件的刪除" #. Plugin validator -#: build/trans_plugins.java:93 +#: build/trans_plugins.java:94 msgid "" "An OSM data validator. It checks for problems in data, and provides fixes " @@ -21074,5 +20983,5 @@ #. Plugin videomapping -#: build/trans_plugins.java:95 +#: build/trans_plugins.java:96 msgid "" "(This Plugin is currently work in progress!!!) Links and syncs a " @@ -21084,5 +20993,5 @@ #. Plugin walkingpapers -#: build/trans_plugins.java:97 +#: build/trans_plugins.java:98 msgid "" "Supports downloading tiled, scanned maps from walking-papers.org. This " @@ -21093,15 +21002,15 @@ #. Plugin waydownloader -#: build/trans_plugins.java:99 +#: build/trans_plugins.java:100 msgid "Easy downloading along a long set of interconnected ways" msgstr "方便的下載一整組互相聯結的路徑" #. Plugin wayselector -#: build/trans_plugins.java:101 +#: build/trans_plugins.java:102 msgid "Select a sequence of non-branching connected ways" msgstr "" #. Plugin wms-turbo-challenge2 -#: build/trans_plugins.java:103 +#: build/trans_plugins.java:104 msgid "" "Drive a race car from point A to point B over aerial imagery, leave cacti " @@ -21110,5 +21019,5 @@ #. Plugin wmsplugin -#: build/trans_plugins.java:105 +#: build/trans_plugins.java:106 msgid "" "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)." @@ -21241,5 +21150,5 @@ #: build/trans_presets.java:1534 build/trans_presets.java:1542 #: build/trans_presets.java:1550 build/trans_presets.java:1584 -#: build/trans_presets.java:2411 build/trans_presets.java:3244 +#: build/trans_presets.java:2429 build/trans_presets.java:3262 msgid "Reference" msgstr "道路編號" @@ -21778,5 +21687,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "metal" msgstr "金屬" @@ -21789,5 +21698,5 @@ #: build/trans_presets.java:559 build/trans_presets.java:581 #: build/trans_presets.java:600 build/trans_presets.java:619 -#: build/trans_presets.java:1254 build/trans_presets.java:2493 +#: build/trans_presets.java:1254 build/trans_presets.java:2511 msgid "wood" msgstr "木頭" @@ -22092,8 +22001,8 @@ #: build/trans_presets.java:1494 build/trans_presets.java:1495 #: build/trans_presets.java:1496 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 -#: build/trans_presets.java:2451 build/trans_presets.java:2492 -#: build/trans_presets.java:2501 build/trans_presets.java:2502 -#: build/trans_presets.java:2503 build/trans_presets.java:2793 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 +#: build/trans_presets.java:2469 build/trans_presets.java:2510 +#: build/trans_presets.java:2519 build/trans_presets.java:2520 +#: build/trans_presets.java:2521 build/trans_presets.java:2811 msgid "yes" msgstr "是" @@ -22204,8 +22113,8 @@ #: build/trans_presets.java:1495 build/trans_presets.java:1496 #: build/trans_presets.java:1788 build/trans_presets.java:1798 -#: build/trans_presets.java:2450 build/trans_presets.java:2451 -#: build/trans_presets.java:2492 build/trans_presets.java:2501 -#: build/trans_presets.java:2502 build/trans_presets.java:2503 -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2468 build/trans_presets.java:2469 +#: build/trans_presets.java:2510 build/trans_presets.java:2519 +#: build/trans_presets.java:2520 build/trans_presets.java:2521 +#: build/trans_presets.java:2811 msgid "no" msgstr "否" @@ -22511,5 +22420,5 @@ #. #: build/trans_presets.java:411 build/trans_style.java:673 -#: build/trans_style.java:4404 +#: build/trans_style.java:4428 msgid "service" msgstr "巷/弄" @@ -22629,5 +22538,5 @@ #. item "Ways/Path" combo "SAC Scale" -#: build/trans_presets.java:487 build/trans_presets.java:3242 +#: build/trans_presets.java:487 build/trans_presets.java:3260 msgid "hiking" msgstr "健行" @@ -22776,4 +22685,9 @@ msgid "Edit Motorway Junction" msgstr "編輯高速公路交流道" + +#. item "Waypoints/Motorway Junction" text "Name" +#: build/trans_presets.java:637 +msgid "Number" +msgstr "編號" #. item "Waypoints/Motorway Junction" text "Number" @@ -22826,13 +22740,13 @@ #: build/trans_presets.java:1388 build/trans_presets.java:1396 #: build/trans_presets.java:1403 build/trans_presets.java:1786 -#: build/trans_presets.java:1796 build/trans_presets.java:2225 -#: build/trans_presets.java:2327 build/trans_presets.java:2357 -#: build/trans_presets.java:2410 build/trans_presets.java:2418 -#: build/trans_presets.java:2435 build/trans_presets.java:2448 -#: build/trans_presets.java:2457 build/trans_presets.java:2464 -#: build/trans_presets.java:2529 build/trans_presets.java:2539 -#: build/trans_presets.java:2740 build/trans_presets.java:2757 -#: build/trans_presets.java:2772 build/trans_presets.java:2811 -#: build/trans_presets.java:3249 +#: build/trans_presets.java:1796 build/trans_presets.java:2243 +#: build/trans_presets.java:2345 build/trans_presets.java:2375 +#: build/trans_presets.java:2428 build/trans_presets.java:2436 +#: build/trans_presets.java:2453 build/trans_presets.java:2466 +#: build/trans_presets.java:2475 build/trans_presets.java:2482 +#: build/trans_presets.java:2547 build/trans_presets.java:2557 +#: build/trans_presets.java:2758 build/trans_presets.java:2775 +#: build/trans_presets.java:2790 build/trans_presets.java:2829 +#: build/trans_presets.java:3267 msgid "Operator" msgstr "經營者" @@ -23100,6 +23014,6 @@ #. item "Geography/Places/Volcano" text "Name" #: build/trans_presets.java:739 build/trans_presets.java:1625 -#: build/trans_presets.java:1770 build/trans_presets.java:2925 -#: build/trans_presets.java:2932 build/trans_presets.java:2939 +#: build/trans_presets.java:1770 build/trans_presets.java:2943 +#: build/trans_presets.java:2950 build/trans_presets.java:2957 msgid "Elevation" msgstr "海拔" @@ -23951,5 +23865,5 @@ #: build/trans_presets.java:1189 build/trans_presets.java:1201 #: build/trans_presets.java:1213 build/trans_presets.java:1225 -#: build/trans_presets.java:1237 build/trans_presets.java:2438 +#: build/trans_presets.java:1237 build/trans_presets.java:2456 msgid "Voltage" msgstr "電壓" @@ -24320,24 +24234,24 @@ #: build/trans_presets.java:1738 build/trans_presets.java:1835 #: build/trans_presets.java:1843 build/trans_presets.java:1946 -#: build/trans_presets.java:1952 build/trans_presets.java:2265 -#: build/trans_presets.java:2289 build/trans_presets.java:2530 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:1952 build/trans_presets.java:2283 +#: build/trans_presets.java:2307 build/trans_presets.java:2548 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Opening Hours" msgstr "開放時間" @@ -24404,23 +24318,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "24/7" msgstr "24/7" @@ -24434,23 +24348,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Mo-Fr 08:30-20:00" msgstr "週一-週五 08:30-20:00" @@ -24464,23 +24378,23 @@ #: build/trans_presets.java:1835 build/trans_presets.java:1843 #: build/trans_presets.java:1946 build/trans_presets.java:1952 -#: build/trans_presets.java:2265 build/trans_presets.java:2289 -#: build/trans_presets.java:2552 build/trans_presets.java:2558 -#: build/trans_presets.java:2565 build/trans_presets.java:2572 -#: build/trans_presets.java:2578 build/trans_presets.java:2584 -#: build/trans_presets.java:2591 build/trans_presets.java:2598 -#: build/trans_presets.java:2605 build/trans_presets.java:2611 -#: build/trans_presets.java:2618 build/trans_presets.java:2624 -#: build/trans_presets.java:2630 build/trans_presets.java:2636 -#: build/trans_presets.java:2642 build/trans_presets.java:2648 -#: build/trans_presets.java:2655 build/trans_presets.java:2662 -#: build/trans_presets.java:2669 build/trans_presets.java:2675 -#: build/trans_presets.java:2681 build/trans_presets.java:2687 -#: build/trans_presets.java:2693 build/trans_presets.java:2699 -#: build/trans_presets.java:2706 build/trans_presets.java:2713 -#: build/trans_presets.java:2720 build/trans_presets.java:2726 -#: build/trans_presets.java:2732 build/trans_presets.java:2758 -#: build/trans_presets.java:2766 build/trans_presets.java:2781 -#: build/trans_presets.java:2787 build/trans_presets.java:2795 -#: build/trans_presets.java:2822 +#: build/trans_presets.java:2283 build/trans_presets.java:2307 +#: build/trans_presets.java:2570 build/trans_presets.java:2576 +#: build/trans_presets.java:2583 build/trans_presets.java:2590 +#: build/trans_presets.java:2596 build/trans_presets.java:2602 +#: build/trans_presets.java:2609 build/trans_presets.java:2616 +#: build/trans_presets.java:2623 build/trans_presets.java:2629 +#: build/trans_presets.java:2636 build/trans_presets.java:2642 +#: build/trans_presets.java:2648 build/trans_presets.java:2654 +#: build/trans_presets.java:2660 build/trans_presets.java:2666 +#: build/trans_presets.java:2673 build/trans_presets.java:2680 +#: build/trans_presets.java:2687 build/trans_presets.java:2693 +#: build/trans_presets.java:2699 build/trans_presets.java:2705 +#: build/trans_presets.java:2711 build/trans_presets.java:2717 +#: build/trans_presets.java:2724 build/trans_presets.java:2731 +#: build/trans_presets.java:2738 build/trans_presets.java:2744 +#: build/trans_presets.java:2750 build/trans_presets.java:2776 +#: build/trans_presets.java:2784 build/trans_presets.java:2799 +#: build/trans_presets.java:2805 build/trans_presets.java:2813 +#: build/trans_presets.java:2840 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00" msgstr "週二-週日 08:00-15:00; 週六 08:00-12:00" @@ -24594,6 +24508,6 @@ #. item "Shops/Vending machine" text "Operator" #: build/trans_presets.java:1367 build/trans_presets.java:1787 -#: build/trans_presets.java:1797 build/trans_presets.java:2449 -#: build/trans_presets.java:2741 +#: build/trans_presets.java:1797 build/trans_presets.java:2467 +#: build/trans_presets.java:2759 msgid "Reference number" msgstr "" @@ -24609,5 +24523,5 @@ #. item "Man Made/Pipeline" combo "Location" -#: build/trans_presets.java:1368 build/trans_presets.java:2359 +#: build/trans_presets.java:1368 build/trans_presets.java:2377 msgid "underground" msgstr "地下" @@ -24621,5 +24535,5 @@ #. item "Amenities/Toilets" text "Reference number" #: build/trans_presets.java:1370 build/trans_presets.java:1788 -#: build/trans_presets.java:1798 build/trans_presets.java:2450 +#: build/trans_presets.java:1798 build/trans_presets.java:2468 msgid "Fee" msgstr "費用" @@ -24795,5 +24709,5 @@ #. item "Public Transport/Subway Entrance" text "Name" -#: build/trans_presets.java:1471 build/trans_presets.java:2451 +#: build/trans_presets.java:1471 build/trans_presets.java:2469 msgid "Wheelchair" msgstr "輪椅" @@ -24831,5 +24745,5 @@ #. #: build/trans_presets.java:1494 build/trans_presets.java:1810 -#: build/trans_presets.java:2501 +#: build/trans_presets.java:2519 msgid "Shelter" msgstr "" @@ -24837,5 +24751,5 @@ #. item "Amenities/Waste Basket" label "Edit Waste Basket" #. -#: build/trans_presets.java:1495 build/trans_presets.java:2489 +#: build/trans_presets.java:1495 build/trans_presets.java:2507 msgid "Bench" msgstr "長椅" @@ -24954,5 +24868,5 @@ #. item "Man Made/Crane" text "Name" #: build/trans_presets.java:1563 build/trans_presets.java:1565 -#: build/trans_presets.java:2375 +#: build/trans_presets.java:2393 msgid "Beacon" msgstr "" @@ -25691,5 +25605,5 @@ #. item "Leisure/Fishing" text "Name" -#: build/trans_presets.java:1904 build/trans_presets.java:2722 +#: build/trans_presets.java:1904 build/trans_presets.java:2740 msgid "Sports" msgstr "運動用品" @@ -25764,5 +25678,53 @@ #. #. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. #. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. +#. color sport +#. +#. 1 +#. 50000 +#. +#. +#. +#. #. color sport #. @@ -25876,12 +25838,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25948,12 +25902,4 @@ #. #. -#. -#. color sport -#. -#. 1 -#. 50000 -#. -#. -#. #. #. color sport @@ -25967,12 +25913,4 @@ #. color sport #. -#. 1 -#. 50000 -#. -#. -#. -#. -#. color sport -#. #. 1 #. 50000 @@ -26134,5 +26072,6 @@ #: build/trans_style.java:4074 build/trans_style.java:4082 #: build/trans_style.java:4090 build/trans_style.java:4098 -#: build/trans_style.java:4106 +#: build/trans_style.java:4106 build/trans_style.java:4114 +#: build/trans_style.java:4122 build/trans_style.java:4130 msgid "sport" msgstr "運動" @@ -26159,4 +26098,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "american_football" +msgstr "澳洲足球" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "australian_football" msgstr "澳洲足球" @@ -26184,4 +26129,10 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "canadian_football" +msgstr "澳洲足球" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 msgid "canoe" msgstr "獨木舟" @@ -26224,6 +26175,7 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "football" -msgstr "美式足球" +#, fuzzy +msgid "gaelic_football" +msgstr "澳洲足球" #: build/trans_presets.java:1913 build/trans_presets.java:1922 @@ -26264,5 +26216,11 @@ #: build/trans_presets.java:1913 build/trans_presets.java:1922 #: build/trans_presets.java:1931 build/trans_presets.java:1940 -msgid "rugby" +msgid "rugby_league" +msgstr "" + +#: build/trans_presets.java:1913 build/trans_presets.java:1922 +#: build/trans_presets.java:1931 build/trans_presets.java:1940 +#, fuzzy +msgid "rugby_union" msgstr "橄欖球" @@ -26383,6 +26341,10 @@ #. item "Sport/Shooting" text "Name" #. item "Sport (Ball)/Soccer" text "Name" -#. item "Sport (Ball)/Football" text "Name" #. item "Sport (Ball)/Australian Football" text "Name" +#. item "Sport (Ball)/American Football" text "Name" +#. item "Sport (Ball)/Canadian Football" text "Name" +#. item "Sport (Ball)/Gaelic Football" text "Name" +#. item "Sport (Ball)/Rugby League" text "Name" +#. item "Sport (Ball)/Rugby Union" text "Name" #. item "Sport (Ball)/Baseball" text "Name" #. item "Sport (Ball)/Basketball" text "Name" @@ -26396,5 +26358,4 @@ #. item "Sport (Ball)/Pelota" text "Name" #. item "Sport (Ball)/Racquet" text "Name" -#. item "Sport (Ball)/Rugby" text "Name" #. item "Sport (Ball)/Table Tennis" text "Name" #. item "Sport (Ball)/Tennis" text "Name" @@ -26416,4 +26377,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "type" msgstr "類型" @@ -26437,6 +26400,10 @@ #. item "Sport/Shooting" combo "type" #. item "Sport (Ball)/Soccer" combo "type" -#. item "Sport (Ball)/Football" combo "type" #. item "Sport (Ball)/Australian Football" combo "type" +#. item "Sport (Ball)/American Football" combo "type" +#. item "Sport (Ball)/Canadian Football" combo "type" +#. item "Sport (Ball)/Gaelic Football" combo "type" +#. item "Sport (Ball)/Rugby League" combo "type" +#. item "Sport (Ball)/Rugby Union" combo "type" #. item "Sport (Ball)/Baseball" combo "type" #. item "Sport (Ball)/Basketball" combo "type" @@ -26449,5 +26416,4 @@ #. item "Sport (Ball)/Pelota" combo "type" #. item "Sport (Ball)/Racquet" combo "type" -#. item "Sport (Ball)/Rugby" combo "type" #. item "Sport (Ball)/Table Tennis" combo "type" #. item "Sport (Ball)/Tennis" combo "type" @@ -26469,4 +26435,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "pitch" msgstr "" @@ -26489,4 +26457,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "sports_centre" msgstr "運動中心" @@ -26509,4 +26479,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "stadium" msgstr "競技揚" @@ -26529,4 +26501,6 @@ #: build/trans_presets.java:2146 build/trans_presets.java:2152 #: build/trans_presets.java:2158 build/trans_presets.java:2164 +#: build/trans_presets.java:2170 build/trans_presets.java:2176 +#: build/trans_presets.java:2182 msgid "track" msgstr "" @@ -26728,158 +26702,194 @@ #: build/trans_presets.java:2070 -msgid "Football" -msgstr "美式足球" - -#. item "Sport (Ball)/Football" -#: build/trans_presets.java:2071 -msgid "Edit Football" -msgstr "編輯美式足球" - -#: build/trans_presets.java:2076 msgid "Australian Football" msgstr "澳洲足球" #. item "Sport (Ball)/Australian Football" -#: build/trans_presets.java:2077 +#: build/trans_presets.java:2071 msgid "Edit Australian Football" msgstr "編輯澳洲足球" +#: build/trans_presets.java:2076 +#, fuzzy +msgid "American Football" +msgstr "澳洲足球" + +#. item "Sport (Ball)/American Football" +#: build/trans_presets.java:2077 +#, fuzzy +msgid "Edit American Football" +msgstr "編輯澳洲足球" + #: build/trans_presets.java:2082 +#, fuzzy +msgid "Canadian Football" +msgstr "編輯美式足球" + +#. item "Sport (Ball)/Canadian Football" +#: build/trans_presets.java:2083 +#, fuzzy +msgid "Edit Canadian Football" +msgstr "編輯澳洲足球" + +#: build/trans_presets.java:2088 +#, fuzzy +msgid "Gaelic Football" +msgstr "編輯美式足球" + +#. item "Sport (Ball)/Gaelic Football" +#: build/trans_presets.java:2089 +#, fuzzy +msgid "Edit Gaelic Football" +msgstr "編輯美式足球" + +#: build/trans_presets.java:2094 +msgid "Rugby League" +msgstr "" + +#. item "Sport (Ball)/Rugby League" +#: build/trans_presets.java:2095 +#, fuzzy +msgid "Edit Rugby League" +msgstr "編輯橄欖球" + +#: build/trans_presets.java:2100 +#, fuzzy +msgid "Rugby Union" +msgstr "橄欖球" + +#. item "Sport (Ball)/Rugby Union" +#: build/trans_presets.java:2101 +#, fuzzy +msgid "Edit Rugby Union" +msgstr "編輯橄欖球" + +#: build/trans_presets.java:2106 msgid "Baseball" msgstr "棒球" #. item "Sport (Ball)/Baseball" -#: build/trans_presets.java:2083 +#: build/trans_presets.java:2107 msgid "Edit Baseball" msgstr "編輯棒球" -#: build/trans_presets.java:2088 +#: build/trans_presets.java:2112 msgid "Basketball" msgstr "籃球" #. item "Sport (Ball)/Basketball" -#: build/trans_presets.java:2089 +#: build/trans_presets.java:2113 msgid "Edit Basketball" msgstr "編輯籃球" -#: build/trans_presets.java:2094 +#: build/trans_presets.java:2118 msgid "Golf" msgstr "高爾夫" #. item "Sport (Ball)/Golf" -#: build/trans_presets.java:2095 +#: build/trans_presets.java:2119 msgid "Edit Golf" msgstr "編輯高爾夫" #. item "Sport (Ball)/Golf" combo "type" -#: build/trans_presets.java:2098 +#: build/trans_presets.java:2122 msgid "golf_course" msgstr "高爾夫路線" -#: build/trans_presets.java:2100 +#: build/trans_presets.java:2124 msgid "Boule" msgstr "" #. item "Sport (Ball)/Boule" -#: build/trans_presets.java:2101 +#: build/trans_presets.java:2125 msgid "Edit Boule" msgstr "" -#: build/trans_presets.java:2106 +#: build/trans_presets.java:2130 msgid "Bowls" msgstr "保齡球" #. item "Sport (Ball)/Bowls" -#: build/trans_presets.java:2107 +#: build/trans_presets.java:2131 msgid "Edit Bowls" msgstr "編輯保齡球" -#: build/trans_presets.java:2112 +#: build/trans_presets.java:2136 msgid "Cricket" msgstr "" #. item "Sport (Ball)/Cricket" -#: build/trans_presets.java:2113 +#: build/trans_presets.java:2137 msgid "Edit Cricket" msgstr "" -#: build/trans_presets.java:2118 +#: build/trans_presets.java:2142 msgid "Cricket Nets" msgstr "" #. item "Sport (Ball)/Cricket Nets" -#: build/trans_presets.java:2119 +#: build/trans_presets.java:2143 msgid "Edit Cricket Nets" msgstr "" -#: build/trans_presets.java:2124 +#: build/trans_presets.java:2148 msgid "Croquet" msgstr "木球" #. item "Sport (Ball)/Croquet" -#: build/trans_presets.java:2125 +#: build/trans_presets.java:2149 msgid "Edit Croquet" msgstr "編輯木球" -#: build/trans_presets.java:2130 +#: build/trans_presets.java:2154 msgid "Hockey" msgstr "曲棍球" #. item "Sport (Ball)/Hockey" -#: build/trans_presets.java:2131 +#: build/trans_presets.java:2155 msgid "Edit Hockey" msgstr "編曲棍球" -#: build/trans_presets.java:2136 +#: build/trans_presets.java:2160 msgid "Pelota" msgstr "回力球" #. item "Sport (Ball)/Pelota" -#: build/trans_presets.java:2137 +#: build/trans_presets.java:2161 msgid "Edit Pelota" msgstr "編輯回力球" -#: build/trans_presets.java:2142 +#: build/trans_presets.java:2166 msgid "Racquet" msgstr "" #. item "Sport (Ball)/Racquet" -#: build/trans_presets.java:2143 +#: build/trans_presets.java:2167 msgid "Edit Racquet" msgstr "" -#: build/trans_presets.java:2148 -msgid "Rugby" -msgstr "橄欖球" - -#. item "Sport (Ball)/Rugby" -#: build/trans_presets.java:2149 -msgid "Edit Rugby" -msgstr "編輯橄欖球" - -#: build/trans_presets.java:2154 +#: build/trans_presets.java:2172 msgid "Table Tennis" msgstr "桌球" #. item "Sport (Ball)/Table Tennis" -#: build/trans_presets.java:2155 +#: build/trans_presets.java:2173 msgid "Edit Table Tennis" msgstr "編輯桌球" -#: build/trans_presets.java:2160 +#: build/trans_presets.java:2178 msgid "Tennis" msgstr "網球" #. item "Sport (Ball)/Tennis" -#: build/trans_presets.java:2161 +#: build/trans_presets.java:2179 msgid "Edit Tennis" msgstr "編輯網路" -#: build/trans_presets.java:2168 +#: build/trans_presets.java:2186 msgid "Man-Made" msgstr "人造物" #. group "Man-Made/Buildings" -#: build/trans_presets.java:2170 +#: build/trans_presets.java:2188 msgid "Building" msgstr "建築物" @@ -26887,5 +26897,5 @@ #. item "Man-Made/Buildings/Building" #. -#: build/trans_presets.java:2173 +#: build/trans_presets.java:2191 msgid "Public Building" msgstr "公共建築" @@ -26893,10 +26903,10 @@ #. item "Man-Made/Buildings/Public Building" #. -#: build/trans_presets.java:2175 +#: build/trans_presets.java:2193 msgid "Edit Public Building" msgstr "編輯公共建築" #. item "Man-Made/Buildings/Public Building" text "Name" -#: build/trans_presets.java:2179 +#: build/trans_presets.java:2197 msgid "Town hall" msgstr "縣市政府/公所" @@ -26904,10 +26914,10 @@ #. item "Man-Made/Buildings/Town hall" #. -#: build/trans_presets.java:2181 +#: build/trans_presets.java:2199 msgid "Edit Town hall" msgstr "編輯縣市政府/公所" #. item "Man-Made/Buildings/Town hall" text "Name" -#: build/trans_presets.java:2185 +#: build/trans_presets.java:2203 msgid "Embassy" msgstr "大使館" @@ -26915,10 +26925,10 @@ #. item "Man-Made/Buildings/Embassy" #. -#: build/trans_presets.java:2187 +#: build/trans_presets.java:2205 msgid "Edit Embassy" msgstr "編輯大使館" #. item "Man-Made/Buildings/Embassy" text "Name" -#: build/trans_presets.java:2191 +#: build/trans_presets.java:2209 msgid "Courthouse" msgstr "法院" @@ -26927,10 +26937,10 @@ #. -#: build/trans_presets.java:2194 +#: build/trans_presets.java:2212 msgid "Edit Courthouse" msgstr "編輯法院" #. item "Man-Made/Buildings/Courthouse" text "Name" -#: build/trans_presets.java:2198 +#: build/trans_presets.java:2216 msgid "Prison" msgstr "監獄" @@ -26939,10 +26949,10 @@ #. -#: build/trans_presets.java:2201 +#: build/trans_presets.java:2219 msgid "Edit Prison" msgstr "編輯監獄" #. item "Man-Made/Buildings/Prison" text "Name" -#: build/trans_presets.java:2205 +#: build/trans_presets.java:2223 msgid "Police" msgstr "警察局" @@ -26952,10 +26962,10 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police" #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" /> -#: build/trans_presets.java:2209 +#: build/trans_presets.java:2227 msgid "Edit Police" msgstr "編輯警察局" #. item "Man-Made/Buildings/Police" text "Name" -#: build/trans_presets.java:2213 +#: build/trans_presets.java:2231 msgid "Fire Station" msgstr "消防隊" @@ -26964,10 +26974,10 @@ #. -#: build/trans_presets.java:2216 +#: build/trans_presets.java:2234 msgid "Edit Fire Station" msgstr "編輯消防隊" #. item "Man-Made/Buildings/Fire Station" text "Name" -#: build/trans_presets.java:2220 +#: build/trans_presets.java:2238 msgid "Post Office" msgstr "郵局" @@ -26975,5 +26985,5 @@ #. item "Man-Made/Buildings/Post Office" #. -#: build/trans_presets.java:2222 +#: build/trans_presets.java:2240 msgid "Edit Post Office" msgstr "編輯郵局" @@ -26981,15 +26991,15 @@ #. item "Man-Made/Buildings/Post Office" text "Operator" #. -#: build/trans_presets.java:2228 +#: build/trans_presets.java:2246 msgid "Kindergarten" msgstr "幼稚園" #. item "Man-Made/Buildings/Kindergarten" -#: build/trans_presets.java:2229 +#: build/trans_presets.java:2247 msgid "Edit Kindergarten" msgstr "編輯幼稚園" #. item "Man-Made/Buildings/Kindergarten" text "Name" -#: build/trans_presets.java:2233 +#: build/trans_presets.java:2251 msgid "School" msgstr "學校" @@ -26997,10 +27007,10 @@ #. item "Man-Made/Buildings/School" #. -#: build/trans_presets.java:2235 +#: build/trans_presets.java:2253 msgid "Edit School" msgstr "編輯學校" #. item "Man-Made/Buildings/School" text "Name" -#: build/trans_presets.java:2239 +#: build/trans_presets.java:2257 msgid "University" msgstr "大學" @@ -27008,10 +27018,10 @@ #. item "Man-Made/Buildings/University" #. -#: build/trans_presets.java:2241 +#: build/trans_presets.java:2259 msgid "Edit University" msgstr "編輯大學" #. item "Man-Made/Buildings/University" text "Name" -#: build/trans_presets.java:2245 +#: build/trans_presets.java:2263 msgid "College" msgstr "學院" @@ -27019,5 +27029,5 @@ #. item "Man-Made/Buildings/College" #. -#: build/trans_presets.java:2247 +#: build/trans_presets.java:2265 msgid "Edit College" msgstr "編輯學院" @@ -27025,5 +27035,5 @@ #. item "Man-Made/Buildings/College" text "Name" #. -#: build/trans_presets.java:2252 +#: build/trans_presets.java:2270 msgid "Cinema" msgstr "電影院" @@ -27032,10 +27042,10 @@ #. -#: build/trans_presets.java:2255 +#: build/trans_presets.java:2273 msgid "Edit Cinema" msgstr "編輯電影院" #. item "Man-Made/Buildings/Cinema" text "Name" -#: build/trans_presets.java:2259 +#: build/trans_presets.java:2277 msgid "Library" msgstr "圖書館" @@ -27044,9 +27054,9 @@ #. -#: build/trans_presets.java:2262 +#: build/trans_presets.java:2280 msgid "Edit Library" msgstr "編輯圖書館" -#: build/trans_presets.java:2267 +#: build/trans_presets.java:2285 msgid "Arts Centre" msgstr "美術館" @@ -27054,10 +27064,10 @@ #. item "Man-Made/Buildings/Arts Centre" #. -#: build/trans_presets.java:2269 +#: build/trans_presets.java:2287 msgid "Edit Arts Centre" msgstr "編輯美術館" #. item "Man-Made/Buildings/Arts Centre" text "Name" -#: build/trans_presets.java:2273 +#: build/trans_presets.java:2291 msgid "Theatre" msgstr "劇院" @@ -27066,10 +27076,10 @@ #. -#: build/trans_presets.java:2276 +#: build/trans_presets.java:2294 msgid "Edit Theatre" msgstr "編輯劇院" #. item "Man-Made/Buildings/Theatre" text "Name" -#: build/trans_presets.java:2280 +#: build/trans_presets.java:2298 msgid "Place of Worship" msgstr "宗教儀式場所" @@ -27079,5 +27089,5 @@ #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship" #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" /> -#: build/trans_presets.java:2284 +#: build/trans_presets.java:2302 msgid "Edit Place of Worship" msgstr "編輯宗教儀式場所" @@ -27086,6 +27096,6 @@ #. item "Land use/Graveyard" text "Name" #. item "Land use/Cemetery" text "Name" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "Religion" msgstr "宗教" @@ -27094,66 +27104,66 @@ #. item "Land use/Graveyard" combo "Religion" #. item "Land use/Cemetery" combo "Religion" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "bahai" msgstr "巴海大同教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "buddhist" msgstr "佛教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "christian" msgstr "基督教系" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "hindu" msgstr "印度教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jain" msgstr "耆那教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "jewish" msgstr "猶太教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "muslim" msgstr "回教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "sikh" msgstr "錫克教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "spiritualist" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "taoist" msgstr "道教" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "unitarian" msgstr "" -#: build/trans_presets.java:2287 build/trans_presets.java:3112 -#: build/trans_presets.java:3121 +#: build/trans_presets.java:2305 build/trans_presets.java:3130 +#: build/trans_presets.java:3139 msgid "zoroastrian" msgstr "祆教" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "Denomination" msgstr "教派" @@ -27162,81 +27172,81 @@ #. item "Land use/Graveyard" combo "Denomination" #. item "Land use/Cemetery" combo "Denomination" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "anglican" msgstr "英國國教" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "baptist" msgstr "浸信會" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "catholic" msgstr "天主教" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "evangelical" msgstr "福音派教會" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "jehovahs_witness" msgstr "" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "lutheran" msgstr "路德教派" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "methodist" msgstr "衛理公會教" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "mormon" msgstr "摩門教" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "orthodox" msgstr "東正教" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "pentecostal" msgstr "聖靈降臨教派" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "presbyterian" msgstr "長老派教會" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "protestant" msgstr "新教" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "quaker" msgstr "教友派" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "shia" msgstr "什葉派" -#: build/trans_presets.java:2288 build/trans_presets.java:3113 -#: build/trans_presets.java:3122 +#: build/trans_presets.java:2306 build/trans_presets.java:3131 +#: build/trans_presets.java:3140 msgid "sunni" msgstr "遜尼派" #. -#: build/trans_presets.java:2292 +#: build/trans_presets.java:2310 msgid "Addresses" msgstr "地址" @@ -27245,5 +27255,5 @@ #. -#: build/trans_presets.java:2295 +#: build/trans_presets.java:2313 msgid "Edit Address Information" msgstr "編輯地址資訊" @@ -27251,5 +27261,5 @@ #. item "Man-Made/Buildings/Addresses" label "Edit Address Information" #. -#: build/trans_presets.java:2297 +#: build/trans_presets.java:2315 msgid "House number" msgstr "門牌號碼" @@ -27257,25 +27267,25 @@ #. item "Man-Made/Buildings/Addresses" text "House number" #. -#: build/trans_presets.java:2299 +#: build/trans_presets.java:2317 msgid "House name" msgstr "房屋名稱" #. item "Man-Made/Buildings/Addresses" text "House name" -#: build/trans_presets.java:2300 +#: build/trans_presets.java:2318 msgid "Street name" msgstr "街道名稱" #. item "Man-Made/Buildings/Addresses" text "Street name" -#: build/trans_presets.java:2301 +#: build/trans_presets.java:2319 msgid "City name" msgstr "城市名稱" #. item "Man-Made/Buildings/Addresses" text "City name" -#: build/trans_presets.java:2302 +#: build/trans_presets.java:2320 msgid "Post code" msgstr "郵遞區號" #. item "Man-Made/Buildings/Addresses" text "Post code" -#: build/trans_presets.java:2303 +#: build/trans_presets.java:2321 msgid "Country code" msgstr "國碼" @@ -27284,5 +27294,5 @@ #. -#: build/trans_presets.java:2309 +#: build/trans_presets.java:2327 msgid "Edit Address Interpolation" msgstr "" @@ -27290,61 +27300,61 @@ #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation" #. -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "Numbering scheme" msgstr "編號規則" #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "odd" msgstr "奇數" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "even" msgstr "偶數" -#: build/trans_presets.java:2311 +#: build/trans_presets.java:2329 msgid "alphabetic" msgstr "按字母順序" -#: build/trans_presets.java:2314 +#: build/trans_presets.java:2332 msgid "Man Made" msgstr "人造物" #. group "Man Made" -#: build/trans_presets.java:2315 +#: build/trans_presets.java:2333 msgid "Works" msgstr "作品" #. item "Man Made/Works" -#: build/trans_presets.java:2316 +#: build/trans_presets.java:2334 msgid "Edit Works" msgstr "編輯作品" #. item "Man Made/Works" text "Name" -#: build/trans_presets.java:2320 +#: build/trans_presets.java:2338 msgid "Tower" msgstr "塔" #. item "Man Made/Tower" -#: build/trans_presets.java:2321 +#: build/trans_presets.java:2339 msgid "Edit Tower" msgstr "編輯塔" #. item "Man Made/Tower" text "Name" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "Tower type" msgstr "塔類型" #. item "Man Made/Tower" combo "Tower type" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "communication" msgstr "通訊" -#: build/trans_presets.java:2324 +#: build/trans_presets.java:2342 msgid "observation" msgstr "觀測" #. -#: build/trans_presets.java:2326 +#: build/trans_presets.java:2344 msgid "Height (meters)" msgstr "高度（米）" @@ -27352,25 +27362,25 @@ #. item "Man Made/Tower" text "Operator" #. -#: build/trans_presets.java:2330 +#: build/trans_presets.java:2348 msgid "Water Tower" msgstr "貯水塔" #. item "Man Made/Water Tower" -#: build/trans_presets.java:2331 +#: build/trans_presets.java:2349 msgid "Edit Water Tower" msgstr "編輯貯水塔" #. item "Man Made/Water Tower" text "Name" -#: build/trans_presets.java:2335 +#: build/trans_presets.java:2353 msgid "Gasometer" msgstr "貯氣桶" #. item "Man Made/Gasometer" -#: build/trans_presets.java:2336 +#: build/trans_presets.java:2354 msgid "Edit Gasometer" msgstr "編輯貯氣桶" #. item "Man Made/Gasometer" text "Name" -#: build/trans_presets.java:2340 +#: build/trans_presets.java:2358 msgid "Lighthouse" msgstr "燈塔" @@ -27378,10 +27388,10 @@ #. item "Man Made/Lighthouse" #. -#: build/trans_presets.java:2342 +#: build/trans_presets.java:2360 msgid "Edit Lighthouse" msgstr "編輯燈塔" #. item "Man Made/Lighthouse" text "Name" -#: build/trans_presets.java:2346 +#: build/trans_presets.java:2364 msgid "Windmill" msgstr "風車" @@ -27389,10 +27399,10 @@ #. item "Man Made/Windmill" #. -#: build/trans_presets.java:2348 +#: build/trans_presets.java:2366 msgid "Edit Windmill" msgstr "編輯風車" #. item "Man Made/Windmill" text "Name" -#: build/trans_presets.java:2352 +#: build/trans_presets.java:2370 msgid "Pipeline" msgstr "油管" @@ -27401,41 +27411,41 @@ #. -#: build/trans_presets.java:2355 +#: build/trans_presets.java:2373 msgid "Edit Pipeline" msgstr "編輯油管" -#: build/trans_presets.java:2358 build/trans_presets.java:2401 +#: build/trans_presets.java:2376 build/trans_presets.java:2419 msgid "gas" msgstr "天然氣" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "heat" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "oil" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "sewage" msgstr "" -#: build/trans_presets.java:2358 +#: build/trans_presets.java:2376 msgid "any substance" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "Location" msgstr "位置" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "underwater" msgstr "" -#: build/trans_presets.java:2359 +#: build/trans_presets.java:2377 msgid "overground" msgstr "" -#: build/trans_presets.java:2361 +#: build/trans_presets.java:2379 msgid "Wastewater Plant" msgstr "汙水處理廠" @@ -27445,10 +27455,10 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant" #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" /> -#: build/trans_presets.java:2365 +#: build/trans_presets.java:2383 msgid "Edit Wastewater Plant" msgstr "編輯汙水處理廠" #. item "Man Made/Wastewater Plant" text "Name" -#: build/trans_presets.java:2369 +#: build/trans_presets.java:2387 msgid "Crane" msgstr "起重機" @@ -27456,5 +27466,5 @@ #. item "Man Made/Crane" #. -#: build/trans_presets.java:2371 +#: build/trans_presets.java:2389 msgid "Edit Crane" msgstr "編輯起重機" @@ -27462,10 +27472,10 @@ #. item "Man Made/Beacon" #. -#: build/trans_presets.java:2377 +#: build/trans_presets.java:2395 msgid "Edit Beacon" msgstr "" #. item "Man Made/Beacon" text "Name" -#: build/trans_presets.java:2381 +#: build/trans_presets.java:2399 msgid "Survey Point" msgstr "測量點" @@ -27473,10 +27483,10 @@ #. item "Man Made/Survey Point" #. -#: build/trans_presets.java:2383 +#: build/trans_presets.java:2401 msgid "Edit Survey Point" msgstr "編輯測量點" #. item "Man Made/Survey Point" text "Name" -#: build/trans_presets.java:2387 +#: build/trans_presets.java:2405 msgid "Surveillance" msgstr "監視" @@ -27484,23 +27494,23 @@ #. item "Man Made/Surveillance" #. -#: build/trans_presets.java:2389 +#: build/trans_presets.java:2407 msgid "Edit Surveillance Camera" msgstr "編輯監視攝影機" #. item "Man Made/Surveillance" combo "Type" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "indoor" msgstr "" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "outdoor" msgstr "戶外" -#: build/trans_presets.java:2392 +#: build/trans_presets.java:2410 msgid "public" msgstr "" #. -#: build/trans_presets.java:2395 +#: build/trans_presets.java:2413 msgid "Power Generator" msgstr "發電廠" @@ -27510,35 +27520,35 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" /> -#: build/trans_presets.java:2399 +#: build/trans_presets.java:2417 msgid "Edit Power Generator" msgstr "編輯發電廠" #. item "Man Made/Power Generator" combo "Type" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "wind" msgstr "風力" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "hydro" msgstr "水力" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "fossil" msgstr "燃油" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "nuclear" msgstr "核能" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "coal" msgstr "燃媒" -#: build/trans_presets.java:2401 +#: build/trans_presets.java:2419 msgid "photovoltaic" msgstr "光電" #. item "Man Made/Power Generator" text "Name" -#: build/trans_presets.java:2404 +#: build/trans_presets.java:2422 msgid "Power Station" msgstr "發電廠" @@ -27547,10 +27557,10 @@ #. -#: build/trans_presets.java:2407 +#: build/trans_presets.java:2425 msgid "Edit Power Station" msgstr "編輯發電廠" #. item "Man Made/Power Station" text "Reference" -#: build/trans_presets.java:2413 +#: build/trans_presets.java:2431 msgid "Power Sub Station" msgstr "" @@ -27559,5 +27569,5 @@ #. -#: build/trans_presets.java:2416 +#: build/trans_presets.java:2434 msgid "Edit Power Sub Station" msgstr "" @@ -27565,10 +27575,10 @@ #. item "Man Made/Power Sub Station" text "Operator" #. item "Man Made/Power Line" text "Operator" -#: build/trans_presets.java:2419 build/trans_presets.java:2436 +#: build/trans_presets.java:2437 build/trans_presets.java:2454 msgid "Line reference" msgstr "" #. item "Man Made/Power Sub Station" text "Line reference" -#: build/trans_presets.java:2421 +#: build/trans_presets.java:2439 msgid "Power Tower" msgstr "電塔" @@ -27579,23 +27589,23 @@ #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" /> -#: build/trans_presets.java:2426 +#: build/trans_presets.java:2444 msgid "Edit Power Tower" msgstr "編輯電塔" #. item "Man Made/Power Tower" combo "Type" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "tower" msgstr "" -#: build/trans_presets.java:2427 +#: build/trans_presets.java:2445 msgid "pole" msgstr "" -#: build/trans_presets.java:2428 +#: build/trans_presets.java:2446 msgid "Tower reference" msgstr "" #. item "Man Made/Power Tower" text "Tower reference" -#: build/trans_presets.java:2430 +#: build/trans_presets.java:2448 msgid "Power Line" msgstr "電線" @@ -27604,74 +27614,74 @@ #. -#: build/trans_presets.java:2433 +#: build/trans_presets.java:2451 msgid "Edit Power Line" msgstr "編輯電線" #. item "Man Made/Power Line" label "Edit Power Line" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "Line type" msgstr "" #. item "Man Made/Power Line" combo "Line type" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "line" msgstr "" -#: build/trans_presets.java:2434 +#: build/trans_presets.java:2452 msgid "minor_line" msgstr "" #. item "Man Made/Power Line" combo "Voltage" -#: build/trans_presets.java:2439 +#: build/trans_presets.java:2457 msgid "Amount of Cables" msgstr "" #. item "Man Made/Power Line" text "Amount of Cables" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "Number of wires (better: conductors) per power cable" msgstr "" #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "single" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "double" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "triple" msgstr "" -#: build/trans_presets.java:2440 +#: build/trans_presets.java:2458 msgid "quad" msgstr "" -#: build/trans_presets.java:2443 +#: build/trans_presets.java:2461 msgid "Amenities" msgstr "便利設施" #. group "Amenities" -#: build/trans_presets.java:2444 +#: build/trans_presets.java:2462 msgid "Toilets" msgstr "廁所" -#: build/trans_presets.java:2451 +#: build/trans_presets.java:2469 msgid "limited" msgstr "" #. item "Shops/Vending machine" text "Reference number" -#: build/trans_presets.java:2452 build/trans_presets.java:2742 +#: build/trans_presets.java:2470 build/trans_presets.java:2760 msgid "Note" msgstr "" #. item "Amenities/Toilets" text "Note" -#: build/trans_presets.java:2454 +#: build/trans_presets.java:2472 msgid "Post Box" msgstr "郵筒" #. item "Amenities/Post Box" text "Operator" -#: build/trans_presets.java:2459 +#: build/trans_presets.java:2477 msgid "Telephone" msgstr "電話" @@ -27680,5 +27690,5 @@ #. -#: build/trans_presets.java:2462 +#: build/trans_presets.java:2480 msgid "Edit Telephone" msgstr "編輯電話" @@ -27686,5 +27696,5 @@ #. item "Amenities/Telephone" text "Operator" #. item "Shops/Vending machine" text "Note" -#: build/trans_presets.java:2465 build/trans_presets.java:2743 +#: build/trans_presets.java:2483 build/trans_presets.java:2761 msgid "Coins" msgstr "硬幣" @@ -27692,5 +27702,5 @@ #. item "Amenities/Telephone" check "Coins" #. item "Shops/Vending machine" check "Coins" -#: build/trans_presets.java:2466 build/trans_presets.java:2744 +#: build/trans_presets.java:2484 build/trans_presets.java:2762 msgid "Notes" msgstr "" @@ -27698,5 +27708,5 @@ #. item "Amenities/Telephone" check "Notes" #. item "Shops/Vending machine" check "Notes" -#: build/trans_presets.java:2467 build/trans_presets.java:2745 +#: build/trans_presets.java:2485 build/trans_presets.java:2763 msgid "Electronic purses and Charge cards" msgstr "電子錢包或收費卡" @@ -27704,5 +27714,5 @@ #. item "Amenities/Telephone" check "Electronic purses and Charge cards" #. item "Shops/Vending machine" check "Electronic purses and Charge cards" -#: build/trans_presets.java:2468 build/trans_presets.java:2746 +#: build/trans_presets.java:2486 build/trans_presets.java:2764 msgid "Debit cards" msgstr "" @@ -27710,15 +27720,15 @@ #. item "Amenities/Telephone" check "Debit cards" #. item "Shops/Vending machine" check "Debit cards" -#: build/trans_presets.java:2469 build/trans_presets.java:2747 +#: build/trans_presets.java:2487 build/trans_presets.java:2765 msgid "Credit cards" msgstr "信用卡" #. item "Amenities/Telephone" check "Credit cards" -#: build/trans_presets.java:2470 +#: build/trans_presets.java:2488 msgid "Telephone cards" msgstr "電話卡" #. item "Amenities/Telephone" check "Telephone cards" -#: build/trans_presets.java:2472 +#: build/trans_presets.java:2490 msgid "Recycling" msgstr "資源回收" @@ -27727,5 +27737,5 @@ #. -#: build/trans_presets.java:2475 +#: build/trans_presets.java:2493 msgid "Edit Recycling station" msgstr "資源回收站" @@ -27733,35 +27743,35 @@ #. item "Amenities/Recycling" label "Edit Recycling station" #. -#: build/trans_presets.java:2477 +#: build/trans_presets.java:2495 msgid "Batteries" msgstr "電池" #. item "Amenities/Recycling" check "Batteries" -#: build/trans_presets.java:2478 +#: build/trans_presets.java:2496 msgid "Cans" msgstr "瓶罐" #. item "Amenities/Recycling" check "Cans" -#: build/trans_presets.java:2479 +#: build/trans_presets.java:2497 msgid "Clothes" msgstr "衣服" #. item "Amenities/Recycling" check "Clothes" -#: build/trans_presets.java:2480 +#: build/trans_presets.java:2498 msgid "Glass" msgstr "玻璃" #. item "Amenities/Recycling" check "Glass" -#: build/trans_presets.java:2481 +#: build/trans_presets.java:2499 msgid "Paper" msgstr "紙張" #. item "Amenities/Recycling" check "Paper" -#: build/trans_presets.java:2482 +#: build/trans_presets.java:2500 msgid "Scrap Metal" msgstr "廢金屬" #. item "Amenities/Recycling" check "Scrap Metal" -#: build/trans_presets.java:2484 +#: build/trans_presets.java:2502 msgid "Waste Basket" msgstr "" @@ -27769,5 +27779,5 @@ #. item "Amenities/Waste Basket" #. -#: build/trans_presets.java:2486 +#: build/trans_presets.java:2504 msgid "Edit Waste Basket" msgstr "" @@ -27776,31 +27786,31 @@ #. #. -#: build/trans_presets.java:2492 +#: build/trans_presets.java:2510 msgid "Backrest" msgstr "" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "Material" msgstr "材質" #. item "Amenities/Bench" combo "Material" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "stone" msgstr "石頭" -#: build/trans_presets.java:2493 +#: build/trans_presets.java:2511 msgid "plastic" msgstr "塑膠" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "Colour" msgstr "顏色" #. item "Amenities/Bench" combo "Colour" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "black" msgstr "黑色" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "brown" msgstr "淺褐色" @@ -27879,5 +27889,5 @@ #. #. -#: build/trans_presets.java:2494 build/trans_style.java:3190 +#: build/trans_presets.java:2512 build/trans_style.java:3190 #: build/trans_style.java:3198 build/trans_style.java:3206 #: build/trans_style.java:3214 build/trans_style.java:3222 @@ -27887,31 +27897,31 @@ msgstr "綠色" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "red" msgstr "紅色" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "blue" msgstr "藍色" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "gray" msgstr "灰色" -#: build/trans_presets.java:2494 +#: build/trans_presets.java:2512 msgid "white" msgstr "白色" -#: build/trans_presets.java:2495 +#: build/trans_presets.java:2513 msgid "Amount of Seats" msgstr "座椅數量" #. item "Amenities/Bench" combo "Amount of Seats" -#: build/trans_presets.java:2497 +#: build/trans_presets.java:2515 msgid "Hunting Stand" msgstr "" #. item "Amenities/Hunting Stand" -#: build/trans_presets.java:2498 +#: build/trans_presets.java:2516 msgid "Edit Hunting Stand" msgstr "" @@ -27920,30 +27930,30 @@ #. #. item "Land use/Tree" text "Type" -#: build/trans_presets.java:2500 build/trans_presets.java:2982 +#: build/trans_presets.java:2518 build/trans_presets.java:3000 msgid "Height" msgstr "高度" #. item "Amenities/Hunting Stand" combo "Height" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "low" msgstr "低" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "half" msgstr "半高" -#: build/trans_presets.java:2500 +#: build/trans_presets.java:2518 msgid "full" msgstr "全高" -#: build/trans_presets.java:2502 +#: build/trans_presets.java:2520 msgid "Hide" msgstr "隱藏" -#: build/trans_presets.java:2503 +#: build/trans_presets.java:2521 msgid "Lock" msgstr "鎖" -#: build/trans_presets.java:2505 +#: build/trans_presets.java:2523 msgid "Fountain" msgstr "噴泉" @@ -27952,10 +27962,10 @@ #. -#: build/trans_presets.java:2508 +#: build/trans_presets.java:2526 msgid "Edit Fountain" msgstr "編輯噴泉" #. item "Amenities/Fountain" text "Name" -#: build/trans_presets.java:2512 +#: build/trans_presets.java:2530 msgid "Drinking Water" msgstr "飲水機" @@ -27964,10 +27974,10 @@ #. -#: build/trans_presets.java:2515 +#: build/trans_presets.java:2533 msgid "Edit Drinking Water" msgstr "編輯飲水機" #. item "Amenities/Drinking Water" text "Name" -#: build/trans_presets.java:2519 +#: build/trans_presets.java:2537 msgid "Fire Hydrant" msgstr "消防栓" @@ -27976,5 +27986,5 @@ #. -#: build/trans_presets.java:2522 +#: build/trans_presets.java:2540 msgid "Edit Fire Hydrant" msgstr "編輯消防栓" @@ -27982,5 +27992,5 @@ #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant" #. -#: build/trans_presets.java:2525 +#: build/trans_presets.java:2543 msgid "Baby Hatch" msgstr "棄嬰保護艙" @@ -27988,15 +27998,15 @@ #. item "Amenities/Baby Hatch" #. -#: build/trans_presets.java:2527 +#: build/trans_presets.java:2545 msgid "Edit Baby Hatch" msgstr "編輯棄嬰保護艙" #. item "Amenities/Baby Hatch" text "Opening Hours" -#: build/trans_presets.java:2533 +#: build/trans_presets.java:2551 msgid "Shops" msgstr "商店" #. group "Shops" -#: build/trans_presets.java:2534 +#: build/trans_presets.java:2552 msgid "Car Dealer" msgstr "汽車經銷商" @@ -28004,10 +28014,10 @@ #. item "Shops/Car Dealer" #. -#: build/trans_presets.java:2536 +#: build/trans_presets.java:2554 msgid "Edit Car Shop" msgstr "編輯汽車商店" #. item "Shops/Car Dealer" text "Operator" -#: build/trans_presets.java:2541 +#: build/trans_presets.java:2559 msgid "Bike Dealer" msgstr "自行車經銷商" @@ -28016,28 +28026,28 @@ #. -#: build/trans_presets.java:2544 +#: build/trans_presets.java:2562 msgid "Edit Bicycle Shop" msgstr "編輯自行車商店" #. item "Shops/Bike Dealer" text "Name" -#: build/trans_presets.java:2548 +#: build/trans_presets.java:2566 msgid "Supermarket" msgstr "超級市場" #. item "Shops/Supermarket" -#: build/trans_presets.java:2549 +#: build/trans_presets.java:2567 msgid "Edit Supermarket" msgstr "編輯超級市場" -#: build/trans_presets.java:2554 +#: build/trans_presets.java:2572 msgid "Chemist" msgstr "" #. item "Shops/Chemist" -#: build/trans_presets.java:2555 +#: build/trans_presets.java:2573 msgid "Edit Chemist" msgstr "" -#: build/trans_presets.java:2560 +#: build/trans_presets.java:2578 msgid "Convenience Store" msgstr "便利商店" @@ -28045,9 +28055,9 @@ #. item "Shops/Convenience Store" #. -#: build/trans_presets.java:2562 +#: build/trans_presets.java:2580 msgid "Edit Convenience Store" msgstr "編輯便利商店" -#: build/trans_presets.java:2567 +#: build/trans_presets.java:2585 msgid "Kiosk" msgstr "" @@ -28055,27 +28065,27 @@ #. item "Shops/Kiosk" #. -#: build/trans_presets.java:2569 +#: build/trans_presets.java:2587 msgid "Edit Kiosk" msgstr "" -#: build/trans_presets.java:2574 +#: build/trans_presets.java:2592 msgid "Book Store" msgstr "書店" #. item "Shops/Book Store" -#: build/trans_presets.java:2575 +#: build/trans_presets.java:2593 msgid "Edit Book Store" msgstr "編輯書店" -#: build/trans_presets.java:2580 +#: build/trans_presets.java:2598 msgid "Travel Agency" msgstr "旅行社" #. item "Shops/Travel Agency" -#: build/trans_presets.java:2581 +#: build/trans_presets.java:2599 msgid "Edit Travel Agency" msgstr "編輯旅行社" -#: build/trans_presets.java:2586 +#: build/trans_presets.java:2604 msgid "Butcher" msgstr "肉類" @@ -28083,9 +28093,9 @@ #. item "Shops/Butcher" #. -#: build/trans_presets.java:2588 +#: build/trans_presets.java:2606 msgid "Edit Butcher" msgstr "編輯肉店" -#: build/trans_presets.java:2593 +#: build/trans_presets.java:2611 msgid "Baker" msgstr "麵包類" @@ -28093,9 +28103,9 @@ #. item "Shops/Baker" #. -#: build/trans_presets.java:2595 +#: build/trans_presets.java:2613 msgid "Edit Baker" msgstr "編輯麵包店" -#: build/trans_presets.java:2600 +#: build/trans_presets.java:2618 msgid "Florist" msgstr "花類" @@ -28103,18 +28113,18 @@ #. item "Shops/Florist" #. -#: build/trans_presets.java:2602 +#: build/trans_presets.java:2620 msgid "Edit Florist" msgstr "編輯花店" -#: build/trans_presets.java:2607 +#: build/trans_presets.java:2625 msgid "Organic" msgstr "有機產品" #. item "Shops/Organic" -#: build/trans_presets.java:2608 +#: build/trans_presets.java:2626 msgid "Edit Organic Shop" msgstr "編輯有機產品商店" -#: build/trans_presets.java:2613 +#: build/trans_presets.java:2631 msgid "Alcohol" msgstr "酒類" @@ -28122,54 +28132,54 @@ #. item "Shops/Alcohol" #. -#: build/trans_presets.java:2615 +#: build/trans_presets.java:2633 msgid "Edit Alcohol Shop" msgstr "編輯賣酒的商店" -#: build/trans_presets.java:2620 +#: build/trans_presets.java:2638 msgid "Beverages" msgstr "飲料類" #. item "Shops/Beverages" -#: build/trans_presets.java:2621 +#: build/trans_presets.java:2639 msgid "Edit Beverages Shop" msgstr "編輯飲料店" -#: build/trans_presets.java:2626 +#: build/trans_presets.java:2644 msgid "Computer" msgstr "電腦類" #. item "Shops/Computer" -#: build/trans_presets.java:2627 +#: build/trans_presets.java:2645 msgid "Edit Computer Shop" msgstr "編輯電腦商店" -#: build/trans_presets.java:2632 +#: build/trans_presets.java:2650 msgid "Electronics" msgstr "電子材料" #. item "Shops/Electronics" -#: build/trans_presets.java:2633 +#: build/trans_presets.java:2651 msgid "Edit Electronics Shop" msgstr "編輯電子材料行" -#: build/trans_presets.java:2638 +#: build/trans_presets.java:2656 msgid "Hifi" msgstr "Hifi" #. item "Shops/Hifi" -#: build/trans_presets.java:2639 +#: build/trans_presets.java:2657 msgid "Edit Hifi Shop" msgstr "編輯 Hifi 音響店" -#: build/trans_presets.java:2644 +#: build/trans_presets.java:2662 msgid "Furniture" msgstr "傢俱類" #. item "Shops/Furniture" -#: build/trans_presets.java:2645 +#: build/trans_presets.java:2663 msgid "Edit Furniture Shop" msgstr "編輯傢俱店" -#: build/trans_presets.java:2650 +#: build/trans_presets.java:2668 msgid "Garden Centre" msgstr "園藝中心" @@ -28177,9 +28187,9 @@ #. item "Shops/Garden Centre" #. -#: build/trans_presets.java:2652 +#: build/trans_presets.java:2670 msgid "Edit Garden Centre" msgstr "編輯園藝中心" -#: build/trans_presets.java:2657 +#: build/trans_presets.java:2675 msgid "Hardware" msgstr "硬體" @@ -28187,9 +28197,9 @@ #. item "Shops/Hardware" #. -#: build/trans_presets.java:2659 +#: build/trans_presets.java:2677 msgid "Edit Hardware Store" msgstr "編輯硬體商店" -#: build/trans_presets.java:2664 +#: build/trans_presets.java:2682 msgid "Do-it-yourself-store" msgstr "DIY 商店" @@ -28197,54 +28207,54 @@ #. item "Shops/Do-it-yourself-store" #. -#: build/trans_presets.java:2666 +#: build/trans_presets.java:2684 msgid "Edit Do-it-yourself-store" msgstr "編輯 DIY 商店" -#: build/trans_presets.java:2671 +#: build/trans_presets.java:2689 msgid "Stationery" msgstr "文具類" #. item "Shops/Stationery" -#: build/trans_presets.java:2672 +#: build/trans_presets.java:2690 msgid "Edit Stationery Shop" msgstr "編輯文具店" -#: build/trans_presets.java:2677 +#: build/trans_presets.java:2695 msgid "Hairdresser" msgstr "美髮類" #. item "Shops/Hairdresser" -#: build/trans_presets.java:2678 +#: build/trans_presets.java:2696 msgid "Edit Hairdresser" msgstr "編輯美髮店" -#: build/trans_presets.java:2683 +#: build/trans_presets.java:2701 msgid "Shoes" msgstr "鞋類" #. item "Shops/Shoes" -#: build/trans_presets.java:2684 +#: build/trans_presets.java:2702 msgid "Edit Shoe Shop" msgstr "編輯鞋店" -#: build/trans_presets.java:2689 +#: build/trans_presets.java:2707 msgid "Toys" msgstr "玩具類" #. item "Shops/Toys" -#: build/trans_presets.java:2690 +#: build/trans_presets.java:2708 msgid "Edit Toy Shop" msgstr "編輯玩具店" -#: build/trans_presets.java:2695 +#: build/trans_presets.java:2713 msgid "Video" msgstr "影片類" #. item "Shops/Video" -#: build/trans_presets.java:2696 +#: build/trans_presets.java:2714 msgid "Edit Video Shop" msgstr "編輯影片類商店" -#: build/trans_presets.java:2701 +#: build/trans_presets.java:2719 msgid "Dry Cleaning" msgstr "乾洗類" @@ -28252,9 +28262,9 @@ #. item "Shops/Dry Cleaning" #. -#: build/trans_presets.java:2703 +#: build/trans_presets.java:2721 msgid "Edit Dry Cleaning" msgstr "編輯乾洗店" -#: build/trans_presets.java:2708 +#: build/trans_presets.java:2726 msgid "Laundry" msgstr "洗衣店" @@ -28262,9 +28272,9 @@ #. item "Shops/Laundry" #. -#: build/trans_presets.java:2710 +#: build/trans_presets.java:2728 msgid "Edit Laundry" msgstr "編輯洗衣店" -#: build/trans_presets.java:2715 +#: build/trans_presets.java:2733 msgid "Outdoor" msgstr "戶外用品" @@ -28272,24 +28282,24 @@ #. item "Shops/Outdoor" #. -#: build/trans_presets.java:2717 +#: build/trans_presets.java:2735 msgid "Edit Outdoor Shop" msgstr "編輯戶外用品店" #. item "Shops/Sports" -#: build/trans_presets.java:2723 +#: build/trans_presets.java:2741 msgid "Edit Sports Shop" msgstr "編輯運動用品店" -#: build/trans_presets.java:2728 +#: build/trans_presets.java:2746 msgid "Optician" msgstr "眼鏡類" #. item "Shops/Optician" -#: build/trans_presets.java:2729 +#: build/trans_presets.java:2747 msgid "Edit Optician" msgstr "編輯眼鏡行" #. -#: build/trans_presets.java:2735 +#: build/trans_presets.java:2753 msgid "Vending machine" msgstr "自動販賣機" @@ -28297,5 +28307,5 @@ #. item "Shops/Vending machine" #. -#: build/trans_presets.java:2737 +#: build/trans_presets.java:2755 msgid "Edit Vending machine" msgstr "編輯自動販賣機" @@ -28303,97 +28313,97 @@ #. item "Shops/Vending machine" label "Edit Vending machine" #. -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "Vending products" msgstr "販賣產品" #. item "Shops/Vending machine" combo "Vending products" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_tickets" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "public_transport_plans" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "parking_tickets" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "food" msgstr "食物" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "drinks" msgstr "飲料" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "sweets" msgstr "甜點" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "cigarettes" msgstr "菸" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "photos" msgstr "相片" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "animal_food" msgstr "飼料" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "news_papers" msgstr "報紙" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "toys" msgstr "玩具" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "stamps" msgstr "郵票" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "SIM-cards" msgstr "SIM-卡" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "telephone_vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "vouchers" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "bicycle_tube" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "condoms" msgstr "保險套" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "tampons" msgstr "" -#: build/trans_presets.java:2739 +#: build/trans_presets.java:2757 msgid "excrement_bags" msgstr "" #. item "Shops/Vending machine" check "Credit cards" -#: build/trans_presets.java:2748 +#: build/trans_presets.java:2766 msgid "Account or loyalty cards" msgstr "" #. item "Shops/Vending machine" check "Account or loyalty cards" -#: build/trans_presets.java:2751 +#: build/trans_presets.java:2769 msgid "Cash" msgstr "現金" #. group "Cash" -#: build/trans_presets.java:2752 +#: build/trans_presets.java:2770 msgid "Bank" msgstr "銀行" @@ -28401,14 +28411,14 @@ #. item "Cash/Bank" #. -#: build/trans_presets.java:2754 +#: build/trans_presets.java:2772 msgid "Edit Bank" msgstr "編輯銀行" -#: build/trans_presets.java:2759 build/trans_presets.java:2768 +#: build/trans_presets.java:2777 build/trans_presets.java:2786 msgid "Automated Teller Machine" msgstr "自動提款機(ATM)" #. item "Cash/Bank" check "Automated Teller Machine" -#: build/trans_presets.java:2761 +#: build/trans_presets.java:2779 msgid "Money Exchange" msgstr "金錢兌換所" @@ -28416,5 +28426,5 @@ #. item "Cash/Money Exchange" #. -#: build/trans_presets.java:2763 +#: build/trans_presets.java:2781 msgid "Edit Money Exchange" msgstr "編輯金錢兌換所" @@ -28422,15 +28432,15 @@ #. item "Cash/Automated Teller Machine" #. -#: build/trans_presets.java:2770 +#: build/trans_presets.java:2788 msgid "Edit Automated Teller Machine" msgstr "編輯自動提款機" #. item "Cash/Automated Teller Machine" text "Operator" -#: build/trans_presets.java:2775 +#: build/trans_presets.java:2793 msgid "Health" msgstr "健康" #. group "Health" -#: build/trans_presets.java:2776 +#: build/trans_presets.java:2794 msgid "Doctors" msgstr "醫師" @@ -28438,18 +28448,18 @@ #. item "Health/Doctors" #. -#: build/trans_presets.java:2778 +#: build/trans_presets.java:2796 msgid "Edit Doctors" msgstr "編輯醫師" -#: build/trans_presets.java:2783 +#: build/trans_presets.java:2801 msgid "Dentist" msgstr "牙醫" #. item "Health/Dentist" -#: build/trans_presets.java:2784 +#: build/trans_presets.java:2802 msgid "Edit Dentist" msgstr "編輯牙醫" -#: build/trans_presets.java:2789 +#: build/trans_presets.java:2807 msgid "Pharmacy" msgstr "藥局" @@ -28457,5 +28467,5 @@ #. item "Health/Pharmacy" #. -#: build/trans_presets.java:2791 +#: build/trans_presets.java:2809 msgid "Edit Pharmacy" msgstr "編輯藥局" @@ -28463,9 +28473,9 @@ #. item "Health/Pharmacy" label "Edit Pharmacy" #. -#: build/trans_presets.java:2793 +#: build/trans_presets.java:2811 msgid "Dispensing" msgstr "配藥" -#: build/trans_presets.java:2797 +#: build/trans_presets.java:2815 msgid "Hospital" msgstr "醫院" @@ -28473,10 +28483,10 @@ #. item "Health/Hospital" #. -#: build/trans_presets.java:2799 +#: build/trans_presets.java:2817 msgid "Edit Hospital" msgstr "編輯醫院" #. item "Health/Hospital" text "Name" -#: build/trans_presets.java:2803 +#: build/trans_presets.java:2821 msgid "Emergency Access Point" msgstr "" @@ -28485,5 +28495,5 @@ #. -#: build/trans_presets.java:2806 +#: build/trans_presets.java:2824 msgid "Edit Emergency Access Point" msgstr "" @@ -28492,20 +28502,20 @@ #. #. -#: build/trans_presets.java:2809 +#: build/trans_presets.java:2827 msgid "Point Number" msgstr "" #. item "Health/Emergency Access Point" text "Point Number" -#: build/trans_presets.java:2810 +#: build/trans_presets.java:2828 msgid "Point Name" msgstr "" #. item "Health/Emergency Access Point" text "Operator" -#: build/trans_presets.java:2812 +#: build/trans_presets.java:2830 msgid "Phone Number" msgstr "電話號碼" #. item "Health/Emergency Access Point" text "Phone Number" -#: build/trans_presets.java:2813 +#: build/trans_presets.java:2831 msgid "(Use international code, like +12-345-67890)" msgstr "(使用國際碼，像是 +12-345-67890)" @@ -28513,5 +28523,5 @@ #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)" #. -#: build/trans_presets.java:2816 +#: build/trans_presets.java:2834 msgid "Veterinary" msgstr "獸醫" @@ -28520,64 +28530,64 @@ #. -#: build/trans_presets.java:2819 +#: build/trans_presets.java:2837 msgid "Edit Veterinary" msgstr "編輯獸醫" -#: build/trans_presets.java:2826 +#: build/trans_presets.java:2844 msgid "Geography" msgstr "地理學" #. group "Geography" -#: build/trans_presets.java:2827 +#: build/trans_presets.java:2845 msgid "Places" msgstr "地名" #. group "Geography/Places" -#: build/trans_presets.java:2828 +#: build/trans_presets.java:2846 msgid "Continent" msgstr "" #. item "Geography/Places/Continent" -#: build/trans_presets.java:2829 +#: build/trans_presets.java:2847 msgid "Edit Continent" msgstr "" #. item "Geography/Places/Continent" text "Name" -#: build/trans_presets.java:2834 +#: build/trans_presets.java:2852 msgid "Country" msgstr "國家" #. item "Geography/Places/Country" -#: build/trans_presets.java:2835 +#: build/trans_presets.java:2853 msgid "Edit Country" msgstr "編輯國家" #. item "Geography/Places/Country" text "Name" -#: build/trans_presets.java:2840 +#: build/trans_presets.java:2858 msgid "State" msgstr "" #. item "Geography/Places/State" -#: build/trans_presets.java:2841 +#: build/trans_presets.java:2859 msgid "Edit State" msgstr "" #. item "Geography/Places/State" text "Name" -#: build/trans_presets.java:2846 +#: build/trans_presets.java:2864 msgid "Region" msgstr "" #. item "Geography/Places/Region" -#: build/trans_presets.java:2847 +#: build/trans_presets.java:2865 msgid "Edit Region" msgstr "" #. item "Geography/Places/Region" text "Name" -#: build/trans_presets.java:2852 +#: build/trans_presets.java:2870 msgid "County" msgstr "縣" #. item "Geography/Places/County" -#: build/trans_presets.java:2853 +#: build/trans_presets.java:2871 msgid "Edit County" msgstr "編輯縣" @@ -28585,15 +28595,15 @@ #. item "Geography/Places/County" text "Name" #. -#: build/trans_presets.java:2859 +#: build/trans_presets.java:2877 msgid "City" msgstr "市" #. item "Geography/Places/City" -#: build/trans_presets.java:2860 +#: build/trans_presets.java:2878 msgid "Edit City" msgstr "編輯市" #. item "Geography/Places/City" text "Name" -#: build/trans_presets.java:2865 +#: build/trans_presets.java:2883 msgid "Town" msgstr "鄉/鎮" @@ -28601,10 +28611,10 @@ #. item "Geography/Places/Town" #. -#: build/trans_presets.java:2867 +#: build/trans_presets.java:2885 msgid "Edit Town" msgstr "編輯鄉/鎮" #. item "Geography/Places/Town" text "Name" -#: build/trans_presets.java:2872 +#: build/trans_presets.java:2890 msgid "Suburb" msgstr "郊區" @@ -28612,25 +28622,25 @@ #. item "Geography/Places/Suburb" #. -#: build/trans_presets.java:2874 +#: build/trans_presets.java:2892 msgid "Edit Suburb" msgstr "編輯郊區" #. item "Geography/Places/Suburb" text "Name" -#: build/trans_presets.java:2879 +#: build/trans_presets.java:2897 msgid "Village" msgstr "村/里" #. item "Geography/Places/Village" -#: build/trans_presets.java:2880 +#: build/trans_presets.java:2898 msgid "Edit Village" msgstr "編輯村/里" #. item "Geography/Places/Village" text "Name" -#: build/trans_presets.java:2885 +#: build/trans_presets.java:2903 msgid "Hamlet" msgstr "" #. item "Geography/Places/Hamlet" -#: build/trans_presets.java:2886 +#: build/trans_presets.java:2904 msgid "Edit Hamlet" msgstr "" @@ -28638,5 +28648,5 @@ #. item "Geography/Places/Hamlet" text "Name" #. -#: build/trans_presets.java:2892 +#: build/trans_presets.java:2910 msgid "Locality" msgstr "" @@ -28644,10 +28654,10 @@ #. item "Geography/Places/Locality" #. -#: build/trans_presets.java:2894 +#: build/trans_presets.java:2912 msgid "Edit Locality" msgstr "" #. item "Geography/Places/Locality" text "Name" -#: build/trans_presets.java:2899 +#: build/trans_presets.java:2917 msgid "Island" msgstr "島嶼" @@ -28655,10 +28665,10 @@ #. item "Geography/Places/Island" #. -#: build/trans_presets.java:2901 +#: build/trans_presets.java:2919 msgid "Edit Island" msgstr "編輯島嶼" #. item "Geography/Places/Island" text "Name" -#: build/trans_presets.java:2906 +#: build/trans_presets.java:2924 msgid "Islet" msgstr "" @@ -28666,5 +28676,5 @@ #. item "Geography/Places/Islet" #. -#: build/trans_presets.java:2908 +#: build/trans_presets.java:2926 msgid "Edit Islet" msgstr "" @@ -28672,5 +28682,5 @@ #. item "Geography/Places/Islet" text "Name" #. -#: build/trans_presets.java:2914 +#: build/trans_presets.java:2932 msgid "Cave Entrance" msgstr "洞窟入口" @@ -28678,10 +28688,10 @@ #. item "Geography/Places/Cave Entrance" #. -#: build/trans_presets.java:2916 +#: build/trans_presets.java:2934 msgid "Edit Cave Entrance" msgstr "編輯洞窟入口" #. item "Geography/Places/Cave Entrance" text "Name" -#: build/trans_presets.java:2920 +#: build/trans_presets.java:2938 msgid "Peak" msgstr "峰" @@ -28689,10 +28699,10 @@ #. item "Geography/Places/Peak" #. -#: build/trans_presets.java:2922 +#: build/trans_presets.java:2940 msgid "Edit Peak" msgstr "編輯山峰" #. item "Geography/Places/Peak" text "Elevation" -#: build/trans_presets.java:2927 +#: build/trans_presets.java:2945 msgid "Glacier" msgstr "冰河" @@ -28700,10 +28710,10 @@ #. item "Geography/Places/Glacier" #. -#: build/trans_presets.java:2929 +#: build/trans_presets.java:2947 msgid "Edit Glacier" msgstr "編輯冰河" #. item "Geography/Places/Glacier" text "Elevation" -#: build/trans_presets.java:2934 +#: build/trans_presets.java:2952 msgid "Volcano" msgstr "火山" @@ -28711,70 +28721,70 @@ #. item "Geography/Places/Volcano" #. -#: build/trans_presets.java:2936 +#: build/trans_presets.java:2954 msgid "Edit Volcano" msgstr "編輯火山" #. item "Geography/Places/Volcano" text "Elevation" -#: build/trans_presets.java:2942 +#: build/trans_presets.java:2960 msgid "Boundaries" msgstr "邊界" #. group "Boundaries" -#: build/trans_presets.java:2943 +#: build/trans_presets.java:2961 msgid "National" msgstr "國界" #. item "Boundaries/National" -#: build/trans_presets.java:2944 +#: build/trans_presets.java:2962 msgid "Edit National Boundary" msgstr "編輯國界" #. item "Boundaries/National" text "Name" -#: build/trans_presets.java:2949 +#: build/trans_presets.java:2967 msgid "Administrative" msgstr "行政區" #. item "Boundaries/Administrative" -#: build/trans_presets.java:2950 +#: build/trans_presets.java:2968 msgid "Edit Administrative Boundary" msgstr "編輯行政區邊界" #. item "Boundaries/Administrative" text "Name" -#: build/trans_presets.java:2955 +#: build/trans_presets.java:2973 msgid "Civil" msgstr "城市的" #. item "Boundaries/Civil" -#: build/trans_presets.java:2956 +#: build/trans_presets.java:2974 msgid "Edit Civil Boundary" msgstr "編輯城市邊界" #. item "Boundaries/Civil" text "Name" -#: build/trans_presets.java:2961 +#: build/trans_presets.java:2979 msgid "Political" msgstr "政治的" #. item "Boundaries/Political" -#: build/trans_presets.java:2962 +#: build/trans_presets.java:2980 msgid "Edit Political Boundary" msgstr "編輯政治的邊界" #. item "Boundaries/Political" text "Name" -#: build/trans_presets.java:2967 +#: build/trans_presets.java:2985 msgid "National park" msgstr "國家公園" #. item "Boundaries/National park" -#: build/trans_presets.java:2968 +#: build/trans_presets.java:2986 msgid "Edit National Park Boundary" msgstr "編輯國家公園" #. item "Boundaries/National park" text "Name" -#: build/trans_presets.java:2974 +#: build/trans_presets.java:2992 msgid "Land use" msgstr "土地利用" #. group "Land use" -#: build/trans_presets.java:2975 +#: build/trans_presets.java:2993 msgid "Tree" msgstr "樹" @@ -28783,15 +28793,15 @@ #. -#: build/trans_presets.java:2978 +#: build/trans_presets.java:2996 msgid "Edit Tree" msgstr "編輯樹" #. item "Land use/Tree" text "Height" -#: build/trans_presets.java:2983 +#: build/trans_presets.java:3001 msgid "Botanical Name" msgstr "植物學名" #. item "Land use/Tree" text "Botanical Name" -#: build/trans_presets.java:2985 +#: build/trans_presets.java:3003 msgid "Wood" msgstr "" @@ -28800,5 +28810,5 @@ #. -#: build/trans_presets.java:2988 +#: build/trans_presets.java:3006 msgid "Edit Wood" msgstr "" @@ -28806,17 +28816,17 @@ #. item "Land use/Wood" combo "Type" #. item "Land use/Forest" combo "Type" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "coniferous" msgstr "松類" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "deciduous" msgstr "落葉類" -#: build/trans_presets.java:2991 build/trans_presets.java:3000 +#: build/trans_presets.java:3009 build/trans_presets.java:3018 msgid "mixed" msgstr "混合" -#: build/trans_presets.java:2993 +#: build/trans_presets.java:3011 msgid "Forest" msgstr "森林" @@ -28825,14 +28835,14 @@ #. -#: build/trans_presets.java:2996 +#: build/trans_presets.java:3014 msgid "Edit Forest Landuse" msgstr "編輯森林土地利用" -#: build/trans_presets.java:3002 +#: build/trans_presets.java:3020 msgid "Nature Reserve" msgstr "自然保育" #. item "Land use/Nature Reserve" -#: build/trans_presets.java:3003 +#: build/trans_presets.java:3021 msgid "Edit Nature Reserve" msgstr "編輯自然保育" @@ -28840,25 +28850,25 @@ #. item "Land use/Nature Reserve" text "Name" #. -#: build/trans_presets.java:3008 +#: build/trans_presets.java:3026 msgid "Scree" msgstr "" #. item "Land use/Scree" -#: build/trans_presets.java:3009 +#: build/trans_presets.java:3027 msgid "Edit Scree" msgstr "" #. item "Land use/Scree" text "Name" -#: build/trans_presets.java:3013 +#: build/trans_presets.java:3031 msgid "Scrub" msgstr "" #. item "Land use/Scrub" -#: build/trans_presets.java:3014 +#: build/trans_presets.java:3032 msgid "Edit Scrub" msgstr "" #. item "Land use/Scrub" text "Name" -#: build/trans_presets.java:3018 +#: build/trans_presets.java:3036 msgid "Fell" msgstr "" @@ -28866,10 +28876,10 @@ #. item "Land use/Fell" #. -#: build/trans_presets.java:3020 +#: build/trans_presets.java:3038 msgid "Edit Fell" msgstr "" #. item "Land use/Fell" text "Name" -#: build/trans_presets.java:3024 +#: build/trans_presets.java:3042 msgid "Heath" msgstr "" @@ -28877,5 +28887,5 @@ #. item "Land use/Heath" #. -#: build/trans_presets.java:3026 +#: build/trans_presets.java:3044 msgid "Edit Heath" msgstr "" @@ -28883,5 +28893,5 @@ #. item "Land use/Heath" text "Name" #. -#: build/trans_presets.java:3031 +#: build/trans_presets.java:3049 msgid "Farmyard" msgstr "" @@ -28890,45 +28900,45 @@ #. -#: build/trans_presets.java:3034 +#: build/trans_presets.java:3052 msgid "Edit Farmyard Landuse" msgstr "" #. item "Land use/Farmyard" text "Name" -#: build/trans_presets.java:3039 +#: build/trans_presets.java:3057 msgid "Farmland" msgstr "農田" #. item "Land use/Farmland" -#: build/trans_presets.java:3040 +#: build/trans_presets.java:3058 msgid "Edit Farmland Landuse" msgstr "編輯農田土地利用" #. item "Land use/Farmland" text "Name" -#: build/trans_presets.java:3045 +#: build/trans_presets.java:3063 msgid "Meadow" msgstr "青草地" #. item "Land use/Meadow" -#: build/trans_presets.java:3046 +#: build/trans_presets.java:3064 msgid "Edit Meadow Landuse" msgstr "編輯青草地土地利用" #. item "Land use/Meadow" text "Name" -#: build/trans_presets.java:3051 +#: build/trans_presets.java:3069 msgid "Vineyard" msgstr "" #. item "Land use/Vineyard" -#: build/trans_presets.java:3052 +#: build/trans_presets.java:3070 msgid "Edit Vineyard Landuse" msgstr "" #. item "Land use/Vineyard" text "Name" -#: build/trans_presets.java:3057 +#: build/trans_presets.java:3075 msgid "Allotments" msgstr "" #. item "Land use/Allotments" -#: build/trans_presets.java:3058 +#: build/trans_presets.java:3076 msgid "Edit Allotments Landuse" msgstr "" @@ -28936,25 +28946,25 @@ #. item "Land use/Allotments" text "Name" #. -#: build/trans_presets.java:3064 +#: build/trans_presets.java:3082 msgid "Garden" msgstr "花園" #. item "Land use/Garden" -#: build/trans_presets.java:3065 +#: build/trans_presets.java:3083 msgid "Edit Garden" msgstr "編輯花園" #. item "Land use/Garden" text "Name" -#: build/trans_presets.java:3069 +#: build/trans_presets.java:3087 msgid "Grass" msgstr "草地" #. item "Land use/Grass" -#: build/trans_presets.java:3070 +#: build/trans_presets.java:3088 msgid "Edit Grass Landuse" msgstr "" #. item "Land use/Grass" text "Name" -#: build/trans_presets.java:3075 +#: build/trans_presets.java:3093 msgid "Village Green" msgstr "" @@ -28962,10 +28972,10 @@ #. item "Land use/Village Green" #. -#: build/trans_presets.java:3077 +#: build/trans_presets.java:3095 msgid "Edit Village Green Landuse" msgstr "" #. item "Land use/Village Green" text "Name" -#: build/trans_presets.java:3082 +#: build/trans_presets.java:3100 msgid "Common" msgstr "" @@ -28973,20 +28983,20 @@ #. item "Land use/Common" #. -#: build/trans_presets.java:3084 +#: build/trans_presets.java:3102 msgid "Edit Common" msgstr "" #. item "Land use/Common" text "Name" -#: build/trans_presets.java:3088 +#: build/trans_presets.java:3106 msgid "Park" msgstr "公園" #. item "Land use/Park" -#: build/trans_presets.java:3089 +#: build/trans_presets.java:3107 msgid "Edit Park" msgstr "編輯公園" #. item "Land use/Park" text "Name" -#: build/trans_presets.java:3093 +#: build/trans_presets.java:3111 msgid "Recreation Ground" msgstr "" @@ -28994,5 +29004,5 @@ #. item "Land use/Recreation Ground" #. -#: build/trans_presets.java:3095 +#: build/trans_presets.java:3113 msgid "Edit Recreation Ground Landuse" msgstr "" @@ -29000,15 +29010,15 @@ #. item "Land use/Recreation Ground" text "Name" #. -#: build/trans_presets.java:3101 +#: build/trans_presets.java:3119 msgid "Residential area" msgstr "" #. item "Land use/Residential area" -#: build/trans_presets.java:3102 +#: build/trans_presets.java:3120 msgid "Edit Residential Landuse" msgstr "" #. item "Land use/Residential area" text "Name" -#: build/trans_presets.java:3107 +#: build/trans_presets.java:3125 msgid "Graveyard" msgstr "" @@ -29016,9 +29026,9 @@ #. item "Land use/Graveyard" #. -#: build/trans_presets.java:3109 +#: build/trans_presets.java:3127 msgid "Edit Graveyard" msgstr "" -#: build/trans_presets.java:3115 +#: build/trans_presets.java:3133 msgid "Cemetery" msgstr "" @@ -29026,39 +29036,39 @@ #. item "Land use/Cemetery" #. -#: build/trans_presets.java:3117 +#: build/trans_presets.java:3135 msgid "Edit Cemetery Landuse" msgstr "" -#: build/trans_presets.java:3124 +#: build/trans_presets.java:3142 msgid "Retail" msgstr "" #. item "Land use/Retail" -#: build/trans_presets.java:3125 +#: build/trans_presets.java:3143 msgid "Edit Retail Landuse" msgstr "" #. item "Land use/Retail" text "Name" -#: build/trans_presets.java:3130 +#: build/trans_presets.java:3148 msgid "Commercial" msgstr "" #. item "Land use/Commercial" -#: build/trans_presets.java:3131 +#: build/trans_presets.java:3149 msgid "Edit Commercial Landuse" msgstr "" #. item "Land use/Commercial" text "Name" -#: build/trans_presets.java:3136 +#: build/trans_presets.java:3154 msgid "Industrial" msgstr "工業區" #. item "Land use/Industrial" -#: build/trans_presets.java:3137 +#: build/trans_presets.java:3155 msgid "Edit Industrial Landuse" msgstr "" #. item "Land use/Industrial" text "Name" -#: build/trans_presets.java:3142 +#: build/trans_presets.java:3160 msgid "Railway land" msgstr "" @@ -29066,15 +29076,15 @@ #. item "Land use/Railway land" #. -#: build/trans_presets.java:3144 +#: build/trans_presets.java:3162 msgid "Edit Railway Landuse" msgstr "" #. item "Land use/Railway land" text "Name" -#: build/trans_presets.java:3149 +#: build/trans_presets.java:3167 msgid "Military" msgstr "" #. item "Land use/Military" -#: build/trans_presets.java:3150 +#: build/trans_presets.java:3168 msgid "Edit Military Landuse" msgstr "" @@ -29082,50 +29092,50 @@ #. item "Land use/Military" text "Name" #. -#: build/trans_presets.java:3156 +#: build/trans_presets.java:3174 msgid "Construction area" msgstr "" #. item "Land use/Construction area" -#: build/trans_presets.java:3157 +#: build/trans_presets.java:3175 msgid "Edit Construction Landuse" msgstr "" #. item "Land use/Construction area" text "Name" -#: build/trans_presets.java:3162 +#: build/trans_presets.java:3180 msgid "Brownfield" msgstr "" #. item "Land use/Brownfield" -#: build/trans_presets.java:3163 +#: build/trans_presets.java:3181 msgid "Edit Brownfield Landuse" msgstr "" #. item "Land use/Brownfield" text "Name" -#: build/trans_presets.java:3168 +#: build/trans_presets.java:3186 msgid "Greenfield" msgstr "" #. item "Land use/Greenfield" -#: build/trans_presets.java:3169 +#: build/trans_presets.java:3187 msgid "Edit Greenfield Landuse" msgstr "" #. item "Land use/Greenfield" text "Name" -#: build/trans_presets.java:3174 +#: build/trans_presets.java:3192 msgid "Landfill" msgstr "" #. item "Land use/Landfill" -#: build/trans_presets.java:3175 +#: build/trans_presets.java:3193 msgid "Edit Landfill Landuse" msgstr "" #. item "Land use/Landfill" text "Name" -#: build/trans_presets.java:3180 +#: build/trans_presets.java:3198 msgid "Quarry" msgstr "" #. item "Land use/Quarry" -#: build/trans_presets.java:3181 +#: build/trans_presets.java:3199 msgid "Edit Quarry Landuse" msgstr "" @@ -29135,5 +29145,5 @@ #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" /> -#: build/trans_presets.java:3193 +#: build/trans_presets.java:3211 msgid "Edit Multipolygon" msgstr "" @@ -29145,5 +29155,5 @@ #. #. -#: build/trans_presets.java:3199 build/trans_presets.java:3216 +#: build/trans_presets.java:3217 build/trans_presets.java:3234 msgid "outer segment" msgstr "" @@ -29151,5 +29161,5 @@ #. item "Relations/Multipolygon" role "outer segment" #. item "Relations/Boundary" role "outer segment" -#: build/trans_presets.java:3200 build/trans_presets.java:3217 +#: build/trans_presets.java:3218 build/trans_presets.java:3235 msgid "inner segment" msgstr "" @@ -29157,5 +29167,5 @@ #. item "Relations/Multipolygon" role "inner segment" #. -#: build/trans_presets.java:3203 +#: build/trans_presets.java:3221 msgid "Boundary" msgstr "" @@ -29166,5 +29176,5 @@ #. es.href="http://wiki.openstreetmap.org/wiki/ES:Relation:boundary" #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:boundary" /> -#: build/trans_presets.java:3208 +#: build/trans_presets.java:3226 msgid "Edit Boundary" msgstr "" @@ -29172,36 +29182,36 @@ #. item "Relations/Boundary" text "Name" #. -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "Boundary type" msgstr "" #. item "Relations/Boundary" combo "Boundary type" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "administrative" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "national" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "civil" msgstr "" -#: build/trans_presets.java:3212 +#: build/trans_presets.java:3230 msgid "political" msgstr "" -#: build/trans_presets.java:3213 +#: build/trans_presets.java:3231 msgid "Administrative level" msgstr "" #. item "Relations/Boundary" role "inner segment" -#: build/trans_presets.java:3218 +#: build/trans_presets.java:3236 msgid "Sub area" msgstr "" #. item "Relations/Boundary" role "Sub area" -#: build/trans_presets.java:3219 +#: build/trans_presets.java:3237 msgid "Administration centre" msgstr "" @@ -29209,5 +29219,5 @@ #. item "Relations/Boundary" role "Administration centre" #. -#: build/trans_presets.java:3222 +#: build/trans_presets.java:3240 msgid "Turn restriction" msgstr "" @@ -29216,5 +29226,5 @@ #. -#: build/trans_presets.java:3225 +#: build/trans_presets.java:3243 msgid "Edit Turn Restriction" msgstr "" @@ -29222,34 +29232,34 @@ #. item "Relations/Turn restriction" label "Edit Turn Restriction" #. -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "Restriction" msgstr "" #. item "Relations/Turn restriction" combo "Restriction" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_left_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_right_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_straight_on" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "no_u_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_right_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_left_turn" msgstr "" -#: build/trans_presets.java:3227 +#: build/trans_presets.java:3245 msgid "only_straight_on" msgstr "" @@ -29258,15 +29268,15 @@ #. #. -#: build/trans_presets.java:3232 +#: build/trans_presets.java:3250 msgid "from way" msgstr "from 路徑" #. item "Relations/Turn restriction" role "from way" -#: build/trans_presets.java:3233 +#: build/trans_presets.java:3251 msgid "via node or way" msgstr "via 節點或路徑" #. item "Relations/Turn restriction" role "via node or way" -#: build/trans_presets.java:3234 +#: build/trans_presets.java:3252 msgid "to way" msgstr "to 路徑" @@ -29274,5 +29284,5 @@ #. item "Relations/Turn restriction" role "to way" #. -#: build/trans_presets.java:3237 +#: build/trans_presets.java:3255 msgid "Route" msgstr "路線" @@ -29281,5 +29291,5 @@ #. -#: build/trans_presets.java:3240 +#: build/trans_presets.java:3258 msgid "Edit Route" msgstr "編輯路線" @@ -29287,5 +29297,5 @@ #. item "Relations/Route" label "Edit Route" #. -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "Route type" msgstr "路線類型" @@ -29393,5 +29403,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:233 +#: build/trans_presets.java:3260 build/trans_style.java:233 #: build/trans_style.java:689 build/trans_style.java:715 #: build/trans_style.java:723 build/trans_style.java:748 @@ -29402,17 +29412,17 @@ msgstr "單車" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "bus" msgstr "公車" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "road" msgstr "道路" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ferry" msgstr "渡輪" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "ski" msgstr "" @@ -29480,5 +29490,5 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:247 +#: build/trans_presets.java:3260 build/trans_style.java:247 #: build/trans_style.java:697 build/trans_style.java:705 #: build/trans_style.java:731 build/trans_style.java:739 @@ -29488,9 +29498,9 @@ msgstr "步行" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "tram" msgstr "路面電車" -#: build/trans_presets.java:3242 +#: build/trans_presets.java:3260 msgid "detour" msgstr "" @@ -29504,10 +29514,10 @@ #. #. -#: build/trans_presets.java:3242 build/trans_style.java:1233 +#: build/trans_presets.java:3260 build/trans_style.java:1233 msgid "subway" msgstr "地下鐵" #. item "Relations/Route" text "Reference" -#: build/trans_presets.java:3245 +#: build/trans_presets.java:3263 msgid "Symbol description" msgstr "" @@ -29515,31 +29525,31 @@ #. item "Relations/Route" text "Description" #. -#: build/trans_presets.java:3248 +#: build/trans_presets.java:3266 msgid "Network" msgstr "網路" #. item "Relations/Route" text "Operator" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "Route state" msgstr "" #. item "Relations/Route" combo "Route state" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "proposed" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "alternate" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "temporary" msgstr "" -#: build/trans_presets.java:3250 +#: build/trans_presets.java:3268 msgid "connection" msgstr "連線" -#: build/trans_presets.java:3251 +#: build/trans_presets.java:3269 msgid "Color (hex)" msgstr "顏色(16 進制)" @@ -29548,30 +29558,30 @@ #. #. -#: build/trans_presets.java:3254 +#: build/trans_presets.java:3272 msgid "route segment" msgstr "" #. item "Relations/Route" role "route segment" -#: build/trans_presets.java:3255 +#: build/trans_presets.java:3273 msgid "forward segment" msgstr "" #. item "Relations/Route" role "forward segment" -#: build/trans_presets.java:3256 +#: build/trans_presets.java:3274 msgid "backward segment" msgstr "" #. item "Relations/Route" role "backward segment" -#: build/trans_presets.java:3257 +#: build/trans_presets.java:3275 msgid "halt point" msgstr "" #. item "Relations/Route" role "halt point" -#: build/trans_presets.java:3258 +#: build/trans_presets.java:3276 msgid "forward halt point" msgstr "" #. item "Relations/Route" role "forward halt point" -#: build/trans_presets.java:3259 +#: build/trans_presets.java:3277 msgid "backward halt point" msgstr "" @@ -29798,5 +29808,5 @@ #: build/trans_style.java:139 build/trans_style.java:174 #: build/trans_style.java:181 build/trans_style.java:188 -#: build/trans_style.java:633 build/trans_style.java:4120 +#: build/trans_style.java:633 build/trans_style.java:4144 msgid "deprecated" msgstr "已廢棄" @@ -33124,11 +33134,11 @@ #. #. -#: build/trans_style.java:4168 build/trans_style.java:4176 -#: build/trans_style.java:4184 build/trans_style.java:4192 -#: build/trans_style.java:4200 build/trans_style.java:4208 -#: build/trans_style.java:4216 build/trans_style.java:4224 -#: build/trans_style.java:4232 build/trans_style.java:4240 -#: build/trans_style.java:4248 build/trans_style.java:4256 -#: build/trans_style.java:4264 +#: build/trans_style.java:4192 build/trans_style.java:4200 +#: build/trans_style.java:4208 build/trans_style.java:4216 +#: build/trans_style.java:4224 build/trans_style.java:4232 +#: build/trans_style.java:4240 build/trans_style.java:4248 +#: build/trans_style.java:4256 build/trans_style.java:4264 +#: build/trans_style.java:4272 build/trans_style.java:4280 +#: build/trans_style.java:4288 msgid "place" msgstr "" @@ -33142,5 +33152,5 @@ #. #. -#: build/trans_style.java:4272 +#: build/trans_style.java:4296 msgid "tiger_data" msgstr "" @@ -33495,4 +33505,121 @@ msgid "Sicily - Italy" msgstr "" + +#~ msgid "" +#~ "An error occurred while communicating with the server
Details: " +#~ "{0}" +#~ msgstr "與伺服器溝通時發生錯誤
詳細資料：{0}" + +#~ msgid "Communication with server failed" +#~ msgstr "與伺服器溝通失敗" + +#~ msgid "Yes, undelete them too" +#~ msgstr "是的，也取消它們的刪除" + +#~ msgid "No, cancel operation" +#~ msgstr "不，取消操作" + +#~ msgid "" +#~ "There is {0} additional node used by way {1}
which is deleted on the " +#~ "server.

Do you want to undelete this node too?" +#~ msgid_plural "" +#~ "There are {0} additional nodes used by way {1}
which are deleted on " +#~ "the server.

Do you want to undelete these nodes too?" +#~ msgstr[0] "" +#~ "有 {0} 個額外節點用於
在伺服器上刪除的路徑 {1} 。

您是否也想要取" +#~ "消刪除這個節點？" + +#~ msgid "Undelete additional nodes?" +#~ msgstr "取消刪除額外的節點？" + +#~ msgid "" +#~ "There is {0} additional primitive referred to by relation {1}
which is " +#~ "deleted on the server.

Do you want to undelete this too?" +#~ msgid_plural "" +#~ "There are {0} additional primitives referred to by relation {1}
which " +#~ "are deleted on the server.

Do you want to undelete these too?" +#~ msgstr[0] "" +#~ "有 {0} 個額外原型用於
在伺服器上刪除的關係 {1} 。

您是否也想要取" +#~ "消刪除它？" + +#~ msgid "Undelete dependent primitives?" +#~ msgstr "是否取消刪除相依的原型？" + +#~ msgid "Visible State:" +#~ msgstr "可視狀態：" + +#~ msgid "visible (on the server)" +#~ msgstr "可視的（在伺服器上）" + +#~ msgid "not visible (on the server)" +#~ msgstr "不可視（在伺服器上）" + +#~ msgid "Keep a clone of the local version" +#~ msgstr "保留本地端版本的複本" + +#~ msgid "Physically delete from local dataset" +#~ msgstr "實際從本地端資料組合中刪除" + +#~ msgid "Keep my visible state" +#~ msgstr "保留我的可見性狀態" + +#~ msgid "Yes, reset the id" +#~ msgstr "是，重設 id" + +#~ msgid "" +#~ "To keep your local version, JOSM
has to reset the id of " +#~ "primitive {0} to 0.
On the next upload the server will assign
it a " +#~ "new id.
Do you agree?" +#~ msgstr "" +#~ "要保留您本地端的版本，JOSM
必須將原型 {0} 的 id 重設為 0。
在" +#~ "下次上傳時伺服器會重新
指派新的 id 給它。
您是否同意？" + +#~ msgid "Reset id to 0" +#~ msgstr "重設 id 為 0" + +#~ msgid "Keep their visible state" +#~ msgstr "保留他們的可見性" + +#~ msgid "Yes, purge it" +#~ msgstr "是，清除它" + +#~ msgid "" +#~ "JOSM will have to remove your local primitive with id {0}
from " +#~ "the dataset.
Do you agree?" +#~ msgstr "" +#~ "JOSM 即將移除您本地資料組合中 id {0}
的原型。
您是否同意？" + +#~ msgid "Remove from dataset" +#~ msgstr "從資料組合移除" + +#~ msgid "Undecide conflict between visible state" +#~ msgstr "在可視狀態間有未決定的衝突" + +#~ msgid "" +#~ "{0} conflict has been resolved automatically by purging " +#~ "{0} object
from the local dataset because it is deleted on the server." +#~ msgid_plural "" +#~ "{0} conflicts have been resolved automatically by " +#~ "purging {0} objects
from the local dataset because they are deleted " +#~ "on the server." +#~ msgstr[0] "" +#~ "{0} 衝突已經以清除本地資料組合 {0} 物件的方式自動調解 " +#~ "
了。因為它已經從伺服器上刪除了。" + +#~ msgid "" +#~ "{0} conflict remains to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve it." +#~ msgid_plural "" +#~ "{0} conflicts remain to be resolved.

Please open the Conflict List " +#~ "Dialog and manually resolve them." +#~ msgstr[0] "" +#~ "還有 {0} 個衝突待調解。

請開啟衝突清單對話盒並手動調解它。" + +#~ msgid "football" +#~ msgstr "美式足球" + +#~ msgid "Football" +#~ msgstr "美式足球" #~ msgid "Open in Browser"